rmultimarkdown 6.2.2.1 → 6.4.0.1

data/ext/mmd/transclude.h

@@ -63,14 +63,6 @@
 #endif
 
 
-/// Combine directory and base filename to create a full path */
-char * path_from_dir_base(const char * dir, const char * base);
-
-
-// Read file into memory
-DString * scan_file(const char * fname);
-
-
 /// Recursively transclude source text, given a search directory.
 /// Track files to prevent infinite recursive loops
 void mmd_transclude_source(DString * source, const char * search_path, const char * source_path, short format, stack * parsed, stack * manifest);

data/ext/mmd/uuid.c

@@ -102,8 +102,8 @@ char * uuid_string_from_bits(unsigned char * raw) {
 	char * result = malloc(37);
 
 	sprintf(result, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-	        raw[0], raw[1], raw[2], raw[3], raw[4], raw[5], raw[6], raw[7],
-	        raw[8], raw[9], raw[10], raw[11], raw[12], raw[13], raw[14], raw[15] );
+			raw[0], raw[1], raw[2], raw[3], raw[4], raw[5], raw[6], raw[7],
+			raw[8], raw[9], raw[10], raw[11], raw[12], raw[13], raw[14], raw[15] );
 
 	return result;
 }
@@ -149,6 +149,6 @@ void custom_seed_rand(void) {
 	// This is not a "cryptographically secure" random seed,
 	// but good enough for an EPUB id....
 	unsigned long seed = mix(clock(), time(NULL), clock());
-	srand(seed);
+	srand((unsigned int)seed);
 }
 

data/ext/mmd/version.h

@@ -2,7 +2,7 @@
 
 	version.h -- MultiMarkdown
 
-	Copyright © 2016 - 2017 Fletcher T. Penney.
+	Copyright © 2016 - 2018 Fletcher T. Penney.
 
 
 	
@@ -23,8 +23,8 @@
 
 #define MULTIMARKDOWN_NAME "MultiMarkdown"
 
-#define MULTIMARKDOWN_VERSION "6.2.2"
-#define MULTIMARKDOWN_COPYRIGHT "Copyright © 2016 - 2017 Fletcher T. Penney."
+#define MULTIMARKDOWN_VERSION "6.4.0"
+#define MULTIMARKDOWN_COPYRIGHT "Copyright © 2016 - 2018 Fletcher T. Penney."
 
 #define MULTIMARKDOWN_LICENSE "\tThe `MultiMarkdown 6` project is released under the MIT License..\n"\
 "	\n"\

data/ext/mmd/writer.c

@@ -69,6 +69,7 @@
 #include "memoir.h"
 #include "mmd.h"
 #include "opendocument-content.h"
+#include "opml.h"
 #include "parser.h"
 #include "scanners.h"
 #include "token.h"
@@ -153,6 +154,7 @@ scratch_pad * scratch_pad_new(mmd_engine * e, short format) {
 		p->header_stack = e->header_stack;
 
 		p->outline_stack = stack_new(0);
+		p->opml_item_closed = 1;
 
 		p->recurse_depth = 0;
 
@@ -418,8 +420,8 @@ char * label_from_string(const char * str) {
 				next_char++;
 			}
 		} else if ((*str >= '0' && *str <= '9') || (*str >= 'A' && *str <= 'Z')
-		           || (*str >= 'a' && *str <= 'z') || (*str == '.') || (*str == '_')
-		           || (*str == '-') || (*str == ':')) {
+				   || (*str >= 'a' && *str <= 'z') || (*str == '.') || (*str == '_')
+				   || (*str == '-') || (*str == ':')) {
 			// Allow 0-9, A-Z, a-z, ., _, -, :
 			d_string_append_c(out, tolower(*str));
 		}
@@ -475,6 +477,22 @@ char * clean_string(const char * str, bool lowercase) {
 
 	while (*str != '\0') {
 		switch (*str) {
+			case '\\':
+				switch (*(str + 1)) {
+					case '\n':
+					case '\r':
+						d_string_append_c(out, '\n');
+						block_whitespace = true;
+						break;
+
+					default:
+						d_string_append_c(out, '\\');
+						block_whitespace = false;
+						break;
+				}
+
+				break;
+
 			case '\t':
 			case ' ':
 			case '\n':
@@ -598,8 +616,10 @@ attr * parse_attributes(char * source) {
 			a->next = attr_new(key, value);
 			a = a->next;
 		} else {
+			#ifndef __clang_analyzer__
 			a = attr_new(key, value);
 			attributes = a;
+			#endif
 		}
 
 		free(value);	// We stored a modified copy
@@ -609,7 +629,7 @@ attr * parse_attributes(char * source) {
 }
 
 
-link * link_new(const char * source, token * label, char * url, char * title, char * attributes) {
+link * link_new(const char * source, token * label, char * url, char * title, char * attributes, short flags) {
 	link * l = malloc(sizeof(link));
 
 	if (l) {
@@ -626,6 +646,8 @@ link * link_new(const char * source, token * label, char * url, char * title, ch
 		l->url = clean_string(url, false);
 		l->title = (title == NULL) ? NULL : my_strdup(title);
 		l->attributes = (attributes == NULL) ? NULL : parse_attributes(attributes);
+
+		l->flags = flags;
 	}
 
 	return l;
@@ -909,7 +931,7 @@ char * destination_accept(const char * source, token ** remainder, bool validate
 
 			// Advance remainder to end of destination
 			while ((*remainder)->next &&
-			        (*remainder)->next->start < start + scan_len) {
+					(*remainder)->next->start < start + scan_len) {
 				*remainder = (*remainder)->next;
 			}
 
@@ -962,7 +984,7 @@ char * url_accept(const char * source, size_t start, size_t max_len, size_t * en
 
 		// Is this <foo>?
 		if ((source[start] == '<') &&
-		        (source[start + scan_len - 1] == '>')) {
+				(source[start + scan_len - 1] == '>')) {
 			// Strip '<' and '>'
 			start++;
 			scan_len -= 2;
@@ -1027,7 +1049,7 @@ void extract_from_paren(token * paren, const char * source, char ** url, char **
 }
 
 
-/// Create a link from an explicit link `[foo](bar)`
+/// Create a link from an explicit "inline" link `[foo](bar)`
 link * explicit_link(scratch_pad * scratch, token * bracket, token * paren, const char * source) {
 	char * url_char = NULL;
 	char * title_char = NULL;
@@ -1038,10 +1060,10 @@ link * explicit_link(scratch_pad * scratch, token * bracket, token * paren, cons
 
 	if (attr_char) {
 		if (!(scratch->extensions & EXT_COMPATIBILITY)) {
-			l = link_new(source, NULL, url_char, title_char, attr_char);
+			l = link_new(source, NULL, url_char, title_char, attr_char, LINK_INLINE);
 		}
 	} else {
-		l = link_new(source, NULL, url_char, title_char, attr_char);
+		l = link_new(source, NULL, url_char, title_char, attr_char, LINK_INLINE);
 	}
 
 	free(url_char);
@@ -1054,6 +1076,7 @@ link * explicit_link(scratch_pad * scratch, token * bracket, token * paren, cons
 
 footnote * footnote_new(const char * source, token * label, token * content, bool lowercase) {
 	footnote * f = malloc(sizeof(footnote));
+	token * walker;
 
 	if (f) {
 		f->label = label;
@@ -1072,6 +1095,25 @@ footnote * footnote_new(const char * source, token * label, token * content, boo
 					token_trim_leading_whitespace(content, source);
 
 				default:
+					// Trim trailing newlines
+					walker = content->tail;
+
+					while (walker) {
+						switch (walker->type) {
+							case TEXT_NL:
+							case TEXT_NL_SP:
+								content->tail = walker->prev;
+								token_free(walker);
+								walker = content->tail;
+								walker->next = NULL;
+								break;
+
+							default:
+								walker = NULL;
+								break;
+						}
+					}
+
 					f->content = token_new_parent(content, BLOCK_PARA);
 					f->free_para = true;
 					break;
@@ -1294,12 +1336,12 @@ bool definition_extract(mmd_engine * e, token ** remainder) {
 						}
 					}
 
-					l = link_new(e->dstr->str, label, url_char, title_char, attr_char);
+					l = link_new(e->dstr->str, label, url_char, title_char, attr_char, LINK_REFERENCE);
 				} else {
 					// Not valid match
 				}
 			} else {
-				l = link_new(e->dstr->str, label, url_char, title_char, attr_char);
+				l = link_new(e->dstr->str, label, url_char, title_char, attr_char, LINK_REFERENCE);
 			}
 
 			// Store link for later use
@@ -1363,12 +1405,14 @@ void process_definition_block(mmd_engine * e, token * block) {
 					}
 
 					// Adjust the properties
-					free(f->label_text);
-					f->label_text = f->clean_text;
+					if (f) {
+						free(f->label_text);
+						f->label_text = f->clean_text;
+					}
 
 					if (f->content->child &&
-					        f->content->child->next &&
-					        f->content->child->next->next) {
+							f->content->child->next &&
+							f->content->child->next->next) {
 						f->clean_text = clean_string_from_range(e->dstr->str, f->content->child->next->next->start, block->start + block->len - f->content->child->next->next->start, false);
 					} else {
 						f->clean_text = NULL;
@@ -1514,7 +1558,7 @@ void process_header_to_links(mmd_engine * e, token * h) {
 
 	d_string_append(url, label);
 
-	link * l = link_new(e->dstr->str, h, url->str, NULL, NULL);
+	link * l = link_new(e->dstr->str, h, url->str, NULL, NULL, LINK_AUTO);
 
 	// Store link for later use
 	stack_push(e->link_stack, l);
@@ -1542,7 +1586,7 @@ void process_table_to_link(mmd_engine * e, token * t) {
 		token * temp_token = t->next->child;
 
 		if (temp_token->next &&
-		        temp_token->next->type == PAIR_BRACKET) {
+				temp_token->next->type == PAIR_BRACKET) {
 			temp_token = temp_token->next;
 		}
 
@@ -1551,7 +1595,7 @@ void process_table_to_link(mmd_engine * e, token * t) {
 		DString * url = d_string_new("#");
 		d_string_append(url, label);
 
-		link * l = link_new(e->dstr->str, temp_token, url->str, NULL, NULL);
+		link * l = link_new(e->dstr->str, temp_token, url->str, NULL, NULL, LINK_AUTO);
 
 		stack_push(e->link_stack, l);
 
@@ -1571,7 +1615,7 @@ void process_table_stack(mmd_engine * e) {
 /// Parse metadata
 void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
 	if ((scratch->extensions & EXT_NO_METADATA) ||
-	        (scratch->extensions & EXT_COMPATIBILITY)) {
+			(scratch->extensions & EXT_COMPATIBILITY)) {
 		return;
 	}
 
@@ -1601,13 +1645,13 @@ void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
 			}
 		} else if (strcmp(m->key, "latexheaderlevel") == 0) {
 			if ((scratch->output_format == FORMAT_LATEX) ||
-			        (scratch->output_format == FORMAT_BEAMER) ||
-			        (scratch->output_format == FORMAT_MEMOIR)) {
+					(scratch->output_format == FORMAT_BEAMER) ||
+					(scratch->output_format == FORMAT_MEMOIR)) {
 				header_level = atoi(m->value);
 			}
 		} else if (strcmp(m->key, "odfheaderlevel") == 0) {
 			if ((scratch->output_format == FORMAT_ODT) ||
-			        (scratch->output_format == FORMAT_FODT)) {
+					(scratch->output_format == FORMAT_FODT)) {
 				header_level = atoi(m->value);
 			}
 		} else if (strcmp(m->key, "language") == 0) {
@@ -1618,7 +1662,7 @@ void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
 				scratch->quotes_lang = GERMAN;
 			} else if (strcmp(temp_char, "es") == 0) {
 				scratch->language = LC_ES;
-				scratch->quotes_lang = ENGLISH;
+				scratch->quotes_lang = SPANISH;
 			} else if (strcmp(temp_char, "fr") == 0) {
 				scratch->language = LC_FR;
 				scratch->quotes_lang = FRENCH;
@@ -1650,18 +1694,21 @@ void process_metadata_stack(mmd_engine * e, scratch_pad * scratch) {
 			temp_char = label_from_string(m->value);
 
 			if ((strcmp(temp_char, "dutch") == 0) ||
-			        (strcmp(temp_char, "nl") == 0)) {
+					(strcmp(temp_char, "nl") == 0)) {
 				scratch->quotes_lang = DUTCH;
 			} else if ((strcmp(temp_char, "french") == 0) ||
-			           (strcmp(temp_char, "fr") == 0)) {
+					   (strcmp(temp_char, "fr") == 0)) {
 				scratch->quotes_lang = FRENCH;
 			} else if ((strcmp(temp_char, "german") == 0) ||
-			           (strcmp(temp_char, "de") == 0)) {
+					   (strcmp(temp_char, "de") == 0)) {
 				scratch->quotes_lang = GERMAN;
 			} else if (strcmp(temp_char, "germanguillemets") == 0) {
 				scratch->quotes_lang = GERMANGUILL;
+			} else if ((strcmp(temp_char, "spanish") == 0) ||
+					   (strcmp(temp_char, "es") == 0)) {
+				scratch->quotes_lang = SPANISH;
 			} else if ((strcmp(temp_char, "swedish") == 0) ||
-			           (strcmp(temp_char, "sv") == 0)) {
+					   (strcmp(temp_char, "sv") == 0)) {
 				scratch->quotes_lang = SWEDISH;
 			} else {
 				scratch->quotes_lang = ENGLISH;
@@ -1767,7 +1814,7 @@ void automatic_search(mmd_engine * e, token * t, trie * ac) {
 
 void identify_global_search_terms(mmd_engine * e, scratch_pad * scratch) {
 	// Only search if we have a target
-	int count = e->abbreviation_stack->size + e->glossary_stack->size;
+	size_t count = e->abbreviation_stack->size + e->glossary_stack->size;
 
 	if (count == 0) {
 		return;
@@ -1825,6 +1872,7 @@ void mmd_engine_export_token_tree(DString * out, mmd_engine * e, short format) {
 
 			mmd_export_token_tree_beamer(out, e->dstr->str, e->root, scratch);
 
+			// Close out any existing outline levels
 			mmd_outline_add_beamer(out, NULL, scratch);
 
 			mmd_export_citation_list_beamer(out, e->dstr->str, scratch);
@@ -1905,6 +1953,10 @@ void mmd_engine_export_token_tree(DString * out, mmd_engine * e, short format) {
 
 //			mmd_end_complete_odf(out, e->dstr->str, scratch);
 			break;
+
+		case FORMAT_OPML:
+			mmd_export_token_tree_opml(out, e->dstr->str, e->root, scratch);
+			break;
 	}
 
 	// Preserve asset_hash for possible use in export
@@ -2459,6 +2511,18 @@ void strip_leading_whitespace(token * chain, const char * source) {
 }
 
 
+void trim_trailing_whitespace_d_string(DString * d) {
+	if (d) {
+		char * c = &(d->str[d->currentStringLength - 1]);
+
+		while (d->currentStringLength && char_is_whitespace(*c)) {
+			*c-- = 0;
+			d->currentStringLength--;
+		}
+	}
+}
+
+
 bool table_has_caption(token * t) {
 
 	if (t->next && t->next->type == BLOCK_PARA) {
@@ -2468,13 +2532,18 @@ bool table_has_caption(token * t) {
 			t = t->next;
 
 			if (t && t->next &&
-			        t->next->type == PAIR_BRACKET) {
+					t->next->type == PAIR_BRACKET) {
 				t = t->next;
 			}
 
+			if (t == NULL) {
+				// End of file
+				return true;
+			}
+
 			if (t && t->next &&
-			        ((t->next->type == TEXT_NL) ||
-			         (t->next->type == TEXT_LINEBREAK))) {
+					((t->next->type == TEXT_NL) ||
+					 (t->next->type == TEXT_LINEBREAK))) {
 				t = t->next;
 			}
 

data/ext/mmd/writer.h

@@ -113,6 +113,7 @@ typedef struct {
 	stack *				header_stack;
 
 	stack *				outline_stack;
+	short				opml_item_closed;
 
 	short				recurse_depth;
 
@@ -144,9 +145,17 @@ struct link {
 	char *				url;
 	char *				title;
 	attr *				attributes;
+	short				flags;
 	UT_hash_handle		hh;
 };
 
+enum link_flags {
+	LINK_INLINE       = 1 << 0,			//!< Inline link, e.g. [foo](#bar)
+	LINK_IMPLICIT     = 1 << 1,			//!< Implicit link, e.g. [foo]
+	LINK_REFERENCE    = 1 << 2,			//!< Reference definition
+	LINK_AUTO         = 1 << 3, 		//!< Automatically generated link (e.g. Headers, tables)
+};
+
 typedef struct link link;
 
 struct footnote {
@@ -236,6 +245,8 @@ void read_table_column_alignments(const char * source, token * table, scratch_pa
 
 void strip_leading_whitespace(token * chain, const char * source);
 
+void trim_trailing_whitespace_d_string(DString * d);
+
 bool table_has_caption(token * table);
 
 char * get_fence_language_specifier(token * fence, const char * source);

data/lib/multi_markdown/version.rb

@@ -1,6 +1,6 @@
 class MultiMarkdown
 
   # The ruby 'multimarkdown' gem version
-  VERSION = "6.2.2.1"
+  VERSION = "6.4.0.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rmultimarkdown
 version: !ruby/object:Gem::Version
-  version: 6.2.2.1
+  version: 6.4.0.1
 platform: ruby
 authors:
 - Till Schulte-Coerne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,8 +54,8 @@ files:
 - ext/mmd/d_string.c
 - ext/mmd/epub.c
 - ext/mmd/epub.h
-- ext/mmd/fodt.c
-- ext/mmd/fodt.h
+- ext/mmd/file.c
+- ext/mmd/file.h
 - ext/mmd/html.c
 - ext/mmd/html.h
 - ext/mmd/i18n.h
@@ -78,6 +78,14 @@ files:
 - ext/mmd/opendocument-content.h
 - ext/mmd/opendocument.c
 - ext/mmd/opendocument.h
+- ext/mmd/opml-lexer.c
+- ext/mmd/opml-lexer.h
+- ext/mmd/opml-parser.c
+- ext/mmd/opml-parser.h
+- ext/mmd/opml-reader.c
+- ext/mmd/opml-reader.h
+- ext/mmd/opml.c
+- ext/mmd/opml.h
 - ext/mmd/parser.c
 - ext/mmd/parser.h
 - ext/mmd/rng.c
@@ -132,5 +140,5 @@ signing_key:
 specification_version: 4
 summary: A MultiMarkdown 6 binding for Ruby
 test_files:
-- test/extensions_test.rb
 - test/multi_markdown_test.rb
+- test/extensions_test.rb