rmultimarkdown 6.4.0.3 → 6.7.0.0

data/ext/mmd/mmd.h

@@ -56,44 +56,44 @@
 #ifndef MMD_MULTIMARKDOWN_H
 #define MMD_MULTIMARKDOWN_H
 
-#include "d_string.h"
 #include "libMultiMarkdown.h"
-#include "stack.h"
-#include "token.h"
-#include "token_pairs.h"
 #include "uthash.h"
 
+typedef struct token_pair_engine toke_pair_engine;
 
 #define kMaxParseRecursiveDepth 1000		//!< Maximum recursion depth when parsing -- to prevent stack overflow with "pathologic" input
 
 
 struct mmd_engine {
-	DString *				dstr;
-	token *					root;
+	DString 		*		dstr;
+	token 		*			root;
 	unsigned long			extensions;
 	unsigned short			recurse_depth;
 
 	bool					allow_meta;
 
-	token_pair_engine *		pairings1;
-	token_pair_engine *		pairings2;
-	token_pair_engine *		pairings3;
-	token_pair_engine *		pairings4;
-
-	stack *					abbreviation_stack;
-	stack *					citation_stack;
-	stack *					definition_stack;
-	stack *					footnote_stack;
-	stack *					glossary_stack;
-	stack *					header_stack;
-	stack *					link_stack;
-	stack *					metadata_stack;
-	stack *					table_stack;
+	struct token_pair_engine 	*	pairings1;
+	struct token_pair_engine 	*	pairings2;
+	struct token_pair_engine 	*	pairings3;
+	struct token_pair_engine 	*	pairings4;
+
+	stack 		*			abbreviation_stack;
+	stack 		*			citation_stack;
+	stack			*		critic_stack;
+	stack 		*			definition_stack;
+	stack 		*			footnote_stack;
+	stack 		*			glossary_stack;
+	stack 		*			header_stack;
+	stack 		*			link_stack;
+	stack 		*			metadata_stack;
+	stack 		*			table_stack;
 
 	short					language;
 	short					quotes_lang;
 
-	struct asset *			asset_hash;
+	struct asset 	*		asset_hash;
+
+	int						random_seed_base_labels;
 };
 
 
@@ -103,15 +103,15 @@ void recursive_parse_list_item(mmd_engine * e, token * block);
 void recursive_parse_blockquote(mmd_engine * e, token * block);
 void strip_line_tokens_from_block(mmd_engine * e, token * block);
 void is_para_html(mmd_engine * e, token * block);
-
+void add_header(mmd_engine * e, token * header);
 
 void is_list_loose(token * list);
 
 
 struct asset {
-	char *				url;
-	char *				asset_path;
-	UT_hash_handle		hh;
+	char 		*		url;
+	char 		*		asset_path;
+	struct UT_hash_handle		hh;
 };
 
 typedef struct asset asset;

data/ext/mmd/object_pool.h

@@ -63,9 +63,9 @@
 
 /// Structure for an object allocator pool
 struct pool {
-	stack *			allocated;		//!< Stack of pointers to slabs that have been allocated
-	void *			next;			//!< Pointer to next available memory for allocation
-	void *			last;			//!< Pointer to end of available memory
+	stack 	*		allocated;		//!< Stack of pointers to slabs that have been allocated
+	void 	*		next;			//!< Pointer to next available memory for allocation
+	void 	*		last;			//!< Pointer to end of available memory
 	short			object_size;	//!< Size of individual objects to be allocated
 
 	char 			_PADDING[6];	//!< pad struct for alignment

data/ext/mmd/opendocument-content.c

@@ -107,9 +107,13 @@
 #include <string.h>
 
 #include "char.h"
+#include "d_string.h"
 #include "opendocument-content.h"
+#include "mmd.h"
 #include "parser.h"
 #include "scanners.h"
+#include "stack.h"
+#include "token.h"
 
 
 #define print(x) d_string_append(out, x)
@@ -136,7 +140,7 @@ static char * my_strdup(const char * source) {
 }
 
 
-void mmd_print_char_opendocument(DString * out, char c) {
+void mmd_print_char_opendocument(DString * out, char c, bool line_breaks) {
 	switch (c) {
 		case '"':
 			print_const("&quot;");
@@ -156,7 +160,12 @@ void mmd_print_char_opendocument(DString * out, char c) {
 
 		case '\n':
 		case '\r':
-			print_const("<text:line-break/>\n");
+			if (line_breaks) {
+				print_const("<text:line-break/>\n");
+			} else {
+				print_char(c);
+			}
+
 			break;
 
 		case '\t':
@@ -169,13 +178,14 @@ void mmd_print_char_opendocument(DString * out, char c) {
 }
 
 
-void mmd_print_string_opendocument(DString * out, const char * str) {
+void mmd_print_string_opendocument(DString * out, const char * str, bool line_breaks) {
 	if (str == NULL) {
 		return;
 	}
 
 	while (*str != '\0') {
-		mmd_print_char_opendocument(out, *str);
+		mmd_print_char_opendocument(out, *str, line_breaks);
+
 		str++;
 	}
 }
@@ -297,6 +307,7 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token
 	}
 
 	char * temp;
+	char * stop;
 
 	switch (t->type) {
 		case AMPERSAND:
@@ -320,7 +331,7 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token
 
 			if (t->next && t->next->type == TEXT_EMPTY && source[t->start + 1] == ' ') {
 			} else {
-				mmd_print_char_opendocument(out, source[t->start + 1]);
+				mmd_print_char_opendocument(out, source[t->start + 1], false);
 			}
 
 			break;
@@ -353,8 +364,9 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token
 		case MARKER_H5:
 		case MARKER_H6:
 			temp = (char *) &source[t->start];
+			stop = (char *) &source[t->start + t->len];
 
-			while (temp) {
+			while (temp < stop) {
 				switch (*temp) {
 					case '#':
 						print_const("#");
@@ -372,7 +384,7 @@ void mmd_export_token_opendocument_raw(DString * out, const char * source, token
 						break;
 
 					default:
-						temp = NULL;
+						temp = stop;
 						break;
 				}
 			}
@@ -511,7 +523,7 @@ void mmd_export_token_opendocument_math(DString * out, const char * source, toke
 void mmd_export_link_opendocument(DString * out, const char * source, token * text, link * link, scratch_pad * scratch) {
 	if (link->url) {
 		print_const("<text:a xlink:type=\"simple\" xlink:href=\"");
-		mmd_print_string_opendocument(out, link->url);
+		mmd_print_string_opendocument(out, link->url, false);
 		print_const("\"");
 	} else {
 		print_const("<a xlink:type=\"simple\" xlink:href=\"\"");
@@ -519,7 +531,7 @@ void mmd_export_link_opendocument(DString * out, const char * source, token * te
 
 	if (link->title && link->title[0] != '\0') {
 		print_const(" office:name=\"");
-		mmd_print_string_opendocument(out, link->title);
+		mmd_print_string_opendocument(out, link->title, false);
 		print_const("\"");
 	}
 
@@ -539,8 +551,8 @@ void mmd_export_link_opendocument(DString * out, const char * source, token * te
 }
 
 
-static char * correct_dimension_units(char *original) {
-	char *result;
+static char * correct_dimension_units(char * original) {
+	char * result;
 	int i;
 
 	result = my_strdup(original);
@@ -611,7 +623,7 @@ void mmd_export_image_opendocument(DString * out, const char * source, token * t
 	print_const(" xlink:type=\"simple\" xlink:show=\"embed\" xlink:actuate=\"onLoad\" draw:filter-name=\"&lt;All formats&gt;\"/>\n</draw:frame></text:p>");
 
 	if (is_figure) {
-		if (text) {
+		if (text && text->len > 3) {
 			print_const("\n<text:p>Figure <text:sequence text:name=\"Figure\" text:formula=\"ooow:Figure+1\" style:num-format=\"1\"> Update Fields to calculate numbers</text:sequence>: ");
 			mmd_export_token_tree_opendocument(out, source, text->child, scratch);
 			print_const("</text:p>");
@@ -624,7 +636,7 @@ void mmd_export_image_opendocument(DString * out, const char * source, token * t
 }
 
 
-void mmd_export_toc_entry_opendocument(DString * out, const char * source, scratch_pad * scratch, size_t * counter, short level) {
+void mmd_export_toc_entry_opendocument(DString * out, const char * source, scratch_pad * scratch, size_t * counter, short level, short min, short max) {
 	token * entry, * next;
 	short entry_level, next_level;
 	char * temp_char;
@@ -635,30 +647,37 @@ void mmd_export_toc_entry_opendocument(DString * out, const char * source, scrat
 		entry = stack_peek_index(scratch->header_stack, *counter);
 		entry_level = raw_level_for_header(entry);
 
-		if (entry_level >= level) {
-			// This entry is a direct descendant of the parent
-			temp_char = label_from_header(source, entry);
-			printf("<text:p text:style-name=\"TOC_Item\"><text:a xlink:type=\"simple\" xlink:href=\"#%s\" text:style-name=\"Index_20_Link\" text:visited-style-name=\"Index_20_Link\">", temp_char);
-			mmd_export_token_tree_opendocument(out, source, entry->child, scratch);
-			print_const(" <text:tab/>1</text:a></text:p>\n");
-
-			if (*counter < scratch->header_stack->size - 1) {
-				next = stack_peek_index(scratch->header_stack, *counter + 1);
-				next_level = next->type - BLOCK_H1 + 1;
-
-				if (next_level > entry_level) {
-					// This entry has children
-					(*counter)++;
-					mmd_export_toc_entry_opendocument(out, source, scratch, counter, entry_level + 1);
+		if (entry_level < min || entry_level > max) {
+			// Ignore this one
+		} else {
+			if (entry_level >= level) {
+				// This entry is a direct descendant of the parent
+				scratch->label_counter = (int) * counter;
+				temp_char = label_from_header(source, entry, scratch);
+				printf("<text:p text:style-name=\"TOC_Item\"><text:a xlink:type=\"simple\" xlink:href=\"#%s\" text:style-name=\"Index_20_Link\" text:visited-style-name=\"Index_20_Link\">", temp_char);
+				mmd_export_token_tree_opendocument(out, source, entry->child, scratch);
+				trim_trailing_whitespace_d_string(out);
+				print_const(" <text:tab/>1</text:a></text:p>\n");
+
+				if (*counter < scratch->header_stack->size - 1) {
+					next = stack_peek_index(scratch->header_stack, *counter + 1);
+					next_level = next->type - BLOCK_H1 + 1;
+
+					if (next_level > entry_level) {
+						// This entry has children
+						(*counter)++;
+						mmd_export_toc_entry_opendocument(out, source, scratch, counter, entry_level + 1, min, max);
+						trim_trailing_whitespace_d_string(out);
+					}
 				}
-			}
 
-			free(temp_char);
-		} else if (entry_level < level ) {
-			// If entry < level, exit this level
-			// Decrement counter first, so that we can test it again later
-			(*counter)--;
-			break;
+				free(temp_char);
+			} else if (entry_level < level ) {
+				// If entry < level, exit this level
+				// Decrement counter first, so that we can test it again later
+				(*counter)--;
+				break;
+			}
 		}
 
 		// Increment counter
@@ -667,9 +686,11 @@ void mmd_export_toc_entry_opendocument(DString * out, const char * source, scrat
 }
 
 
-void mmd_export_toc_opendocument(DString * out, const char * source, scratch_pad * scratch) {
+void mmd_export_toc_opendocument(DString * out, const char * source, scratch_pad * scratch, short min, short max) {
 	size_t counter = 0;
 
+	int old_label_counter = scratch->label_counter;
+
 	// TODO: Could use LC to internationalize this
 	print_const("<text:table-of-content text:style-name=\"Sect1\" text:protected=\"true\" text:name=\"Table of Contents1\">\n");
 	print_const("<text:table-of-content-source text:outline-level=\"10\">\n");
@@ -679,9 +700,11 @@ void mmd_export_toc_opendocument(DString * out, const char * source, scratch_pad
 	print_const("<text:p text:style-name=\"Contents_20_Heading\">Table of Contents</text:p>\n");
 	print_const("</text:index-title>\n");
 
-	mmd_export_toc_entry_opendocument(out, source, scratch, &counter, 0);
+	mmd_export_toc_entry_opendocument(out, source, scratch, &counter, 0, min, max);
 
 	print_const("</text:index-body>\n</text:table-of-content>\n\n");
+
+	scratch->label_counter = old_label_counter;
 }
 
 
@@ -700,6 +723,7 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 	bool	temp_bool	= 0;
 	token *	temp_token	= NULL;
 	footnote * temp_note = NULL;
+	size_t	temp_size;
 
 	switch (t->type) {
 		case DOC_START_TOKEN:
@@ -766,6 +790,7 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 					// Raw source
 					if (raw_filter_text_matches(temp_char, FORMAT_ODT)) {
 						switch (t->child->tail->type) {
+							case CODE_FENCE_LINE:
 							case LINE_FENCE_BACKTICK_3:
 							case LINE_FENCE_BACKTICK_4:
 							case LINE_FENCE_BACKTICK_5:
@@ -780,7 +805,10 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 							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);
+							if (t->child->next) {
+								d_string_append_c_array(out, &source[t->child->start + t->child->len], t->start + t->len - t->child->next->start);
+							}
+
 							scratch->padded = 0;
 						}
 					}
@@ -851,6 +879,9 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 			scratch->padded = 1;
 			break;
 
+		case MARKER_DEFLIST_COLON:
+			break;
+
 		case BLOCK_EMPTY:
 			break;
 
@@ -879,17 +910,29 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 
 			printf("<text:h text:outline-level=\"%d\">", temp_short + scratch->base_header_level - 1);
 
+			header_clean_trailing_whitespace(t->child, source);
+
 			if (scratch->extensions & EXT_NO_LABELS) {
 				mmd_export_token_tree_opendocument(out, source, t->child, scratch);
 			} else {
-				temp_char = label_from_header(source, t);
+				temp_char = label_from_header(source, t, scratch);
 				printf("<text:bookmark text:name=\"%s\"/>", temp_char);
 				mmd_export_token_tree_opendocument(out, source, t->child, scratch);
 				//printf("<text:bookmark-end text:name=\"%s\"/>", temp_char);
 				free(temp_char);
 			}
 
-			trim_trailing_whitespace_d_string(out);
+			temp_size = 0;
+
+			while (temp_size != out->currentStringLength) {
+				temp_size = out->currentStringLength;
+
+				trim_trailing_whitespace_d_string(out);
+
+				if (strcmp(&(out->str[out->currentStringLength - 11]), "<text:tab/>") == 0) {
+					d_string_erase(out, out->currentStringLength - 11, 11);
+				}
+			}
 
 			print_const("</text:h>");
 			scratch->padded = 0;
@@ -1099,7 +1142,21 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 		case BLOCK_TOC:
 			pad(out, 2, scratch);
 
-			mmd_export_toc_opendocument(out, source, scratch);
+			// Define range
+			if (t->child->child->type == TOC) {
+				temp_short = 1;
+				temp_short2 = 6;
+			} else {
+				temp_short = source[t->start + 6] - '0';
+
+				if (t->child->child->type == TOC_RANGE) {
+					temp_short2 = source[t->start + 8] - '0';
+				} else {
+					temp_short2 = temp_short;
+				}
+			}
+
+			mmd_export_toc_opendocument(out, source, scratch, temp_short, temp_short2);
 
 			scratch->padded = 1;
 			break;
@@ -1232,7 +1289,7 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 					(source[t->start + 1] == ' ')) {
 				print_const(" ");		// This is a non-breaking space character
 			} else {
-				mmd_print_char_opendocument(out, source[t->start + 1]);
+				mmd_print_char_opendocument(out, source[t->start + 1], false);
 			}
 
 			break;
@@ -1293,6 +1350,8 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 		case MARKER_H4:
 		case MARKER_H5:
 		case MARKER_H6:
+		case MARKER_SETEXT_1:
+		case MARKER_SETEXT_2:
 		case MARKER_LIST_BULLET:
 		case MARKER_LIST_ENUMERATOR:
 			break;
@@ -1371,9 +1430,9 @@ void mmd_export_token_opendocument(DString * out, const char * source, token * t
 					temp_bool = false;
 				}
 
-				mmd_print_string_opendocument(out, temp_char);
+				mmd_print_string_opendocument(out, temp_char, false);
 				print_const("\">");
-				mmd_print_string_opendocument(out, temp_char);
+				mmd_print_string_opendocument(out, temp_char, false);
 				print_const("</text:a>");
 			} else if (scan_html(&source[t->start])) {
 				// We ignore HTML blocks
@@ -1688,11 +1747,11 @@ parse_citation:
 
 					if (temp_short3 == scratch->inline_abbreviations_to_free->size) {
 						// This is a reference definition
-						mmd_print_string_opendocument(out, temp_note->label_text);
+						mmd_print_string_opendocument(out, temp_note->label_text, true);
 //						mmd_export_token_tree_opendocument(out, source, t->child, scratch);
 					} else {
 						// This is an inline definition
-						mmd_print_string_opendocument(out, temp_note->label_text);
+						mmd_print_string_opendocument(out, temp_note->label_text, true);
 //						mmd_export_token_tree_opendocument(out, source, t->child, scratch);
 					}
 				} else {
@@ -1702,15 +1761,15 @@ parse_citation:
 
 					if (temp_short3 == scratch->inline_abbreviations_to_free->size) {
 						// This is a reference definition
-						mmd_print_string_opendocument(out, temp_note->clean_text);
+						mmd_print_string_opendocument(out, temp_note->clean_text, true);
 						print_const(" (");
-						mmd_print_string_opendocument(out, temp_note->label_text);
+						mmd_print_string_opendocument(out, temp_note->label_text, true);
 						print_const(")");
 					} else {
 						// This is an inline definition
-						mmd_print_string_opendocument(out, temp_note->clean_text);
+						mmd_print_string_opendocument(out, temp_note->clean_text, true);
 						print_const(" (");
-						mmd_print_string_opendocument(out, temp_note->label_text);
+						mmd_print_string_opendocument(out, temp_note->label_text, true);
 						print_const(")");
 					}
 
@@ -1750,11 +1809,11 @@ parse_citation:
 				if (temp_short2 == scratch->used_glossaries->size) {
 					// This is a re-use of a previously used note
 
-					mmd_print_string_opendocument(out, temp_note->clean_text);
+					mmd_print_string_opendocument(out, temp_note->clean_text, true);
 				} else {
 					// This is the first time this note was used
 
-					mmd_print_string_opendocument(out, temp_note->clean_text);
+					mmd_print_string_opendocument(out, temp_note->clean_text, true);
 
 					printf("<text:note text:id=\"gn%d\" text:note-class=\"glossary\"><text:note-body>", temp_short);
 					mmd_export_token_tree_opendocument(out, source, temp_note->content, scratch);
@@ -1774,7 +1833,7 @@ parse_citation:
 			temp_char2 = extract_metadata(scratch, temp_char);
 
 			if (temp_char2) {
-				mmd_print_string_opendocument(out, temp_char2);
+				mmd_print_string_opendocument(out, temp_char2, true);
 			} else {
 				mmd_export_token_tree_opendocument(out, source, t->child, scratch);
 			}
@@ -2046,22 +2105,26 @@ parse_citation:
 			} else {
 				print_const(">\n<text:p");
 
-				switch (scratch->table_alignment[scratch->table_cell_count]) {
-					case 'l':
-					case 'L':
-					default:
-						print_const(" text:style-name=\"MMD-Table\"");
-						break;
-
-					case 'r':
-					case 'R':
-						print_const(" text:style-name=\"MMD-Table-Right\"");
-						break;
-
-					case 'c':
-					case 'C':
-						print_const(" text:style-name=\"MMD-Table-Center\"");
-						break;
+				if (scratch->table_cell_count < kMaxTableColumns) {
+					switch (scratch->table_alignment[scratch->table_cell_count]) {
+						case 'l':
+						case 'L':
+						default:
+							print_const(" text:style-name=\"MMD-Table\"");
+							break;
+
+						case 'r':
+						case 'R':
+							print_const(" text:style-name=\"MMD-Table-Right\"");
+							break;
+
+						case 'c':
+						case 'C':
+							print_const(" text:style-name=\"MMD-Table-Center\"");
+							break;
+					}
+				} else {
+					print_const(" text:style-name=\"MMD-Table\"");
 				}
 			}
 
@@ -2117,10 +2180,15 @@ parse_citation:
 		case TEXT_PERIOD:
 		case TEXT_PLAIN:
 		case TOC:
+		case TOC_SINGLE:
+		case TOC_RANGE:
 		case UL:
 			print_token(t);
 			break;
 
+		case OBJECT_REPLACEMENT_CHARACTER:
+			break;
+
 		default:
 			fprintf(stderr, "Unknown token type: %d\n", t->type);
 			token_describe(t, source);

data/ext/mmd/opendocument-content.h

@@ -107,8 +107,8 @@
 
 #include "writer.h"
 
-void mmd_print_char_opendocument(DString * out, char c);
-void mmd_print_string_opendocument(DString * out, const char * str);
+void mmd_print_char_opendocument(DString * out, char c, bool line_breaks);
+void mmd_print_string_opendocument(DString * out, const char * str, bool line_breaks);
 void mmd_print_localized_char_opendocument(DString * out, unsigned short type, scratch_pad * scratch);
 
 void mmd_export_token_opendocument_raw(DString * out, const char * source, token * t, scratch_pad * scratch);