rmultimarkdown 6.4.0.4 → 6.7.0.0

data/ext/mmd/scanners.h

@@ -76,6 +76,7 @@ size_t scan_atx(const char * c);
 size_t scan_definition(const char * c);
 size_t scan_destination(const char * c);
 size_t scan_email(const char * c);
+size_t scan_empty_meta_line(const char * c);
 size_t scan_fence_start(const char * c);
 size_t scan_fence_end(const char * c);
 size_t scan_html(const char * c);

data/ext/mmd/stack.c

@@ -1,6 +1,6 @@
 /**
 
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
+	libCoreUtilities -- Reusable component libraries
 
 	@file stack.c
 
@@ -14,23 +14,12 @@
 
 /*
 
-	Copyright © 2016 - 2017 Fletcher T. Penney.
+	Copyright © 2016-2020 Fletcher T. Penney.
 
 
-	The `MultiMarkdown 6` project is released under the MIT License..
+	MIT License
 
-	GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project:
-
- https://github.com/fletcher/MultiMarkdown-4/
-
-	MMD 4 is released under both the MIT License and GPL.
-
-
-	CuTest is released under the zlib/libpng license. See CuTest.c for the text
-	of the license.
-
-
-	## The MIT License ##
+	Copyright (c) 2016-2020 Fletcher T. Penney
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
@@ -39,24 +28,28 @@
 	copies of the Software, and to permit persons to whom the Software is
 	furnished to do so, subject to the following conditions:
 
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
+	The above copyright notice and this permission notice shall be included in all
+	copies or substantial portions of the Software.
 
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	SOFTWARE.
 
- */
+*/
 
 #include <stdlib.h>
 #include <string.h>
 
 #include "stack.h"
 
+#ifdef TEST
+	#include "CuTest.h"
+#endif
+
 #define kStackStartingSize 64
 
 
@@ -94,6 +87,26 @@ void stack_free(stack * s) {
 }
 
 
+#ifdef TEST
+void Test_stack_new(CuTest * tc) {
+	stack * s = stack_new(0);
+	CuAssertIntEquals(tc, kStackStartingSize, s->capacity);
+	CuAssertIntEquals(tc, 0, s->size);
+	stack_free(s);
+
+	s = stack_new(-1);
+	CuAssertIntEquals(tc, kStackStartingSize, s->capacity);
+	CuAssertIntEquals(tc, 0, s->size);
+	stack_free(s);
+
+	s = stack_new(10);
+	CuAssertIntEquals(tc, 10, s->capacity);
+	CuAssertIntEquals(tc, 0, s->size);
+	stack_free(s);
+}
+#endif
+
+
 /// Add a new pointer to the stack
 void stack_push(stack * s, void * element) {
 	if (s->size == s->capacity) {
@@ -137,6 +150,35 @@ void * stack_peek_index(stack * s, size_t index) {
 }
 
 
+#ifdef TEST
+void Test_stack_push_pop(CuTest * tc) {
+	stack * s = stack_new(1);
+
+	char * s1 = "foo";
+	char * s2 = "bar";
+	char * s3 = "bat";
+
+	stack_push(s, s1);
+	stack_push(s, s2);
+	stack_push(s, s3);
+
+	CuAssertIntEquals(tc, 3, s->size);
+	CuAssertIntEquals(tc, 4, s->capacity);
+
+	CuAssertStrEquals(tc, "bat", stack_peek(s));
+	CuAssertStrEquals(tc, "foo", stack_peek_index(s, 0));
+
+	CuAssertStrEquals(tc, "bat", stack_pop(s));
+	CuAssertStrEquals(tc, "bar", stack_pop(s));
+	CuAssertStrEquals(tc, "foo", stack_pop(s));
+
+	CuAssertIntEquals(tc, 0, s->size);
+
+	stack_free(s);
+}
+#endif
+
+
 /// Sort array using specified compare_function
 void stack_sort(stack * s, void * compare_function) {
 	qsort(s->element, s->size, sizeof(void *), compare_function);

data/ext/mmd/stack.h

@@ -1,6 +1,6 @@
 /**
 
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
+	libCoreUtilities -- Reusable component libraries
 
 	@file stack.h
 
@@ -14,23 +14,12 @@
 
 /*
 
-	Copyright © 2016 - 2017 Fletcher T. Penney.
+	Copyright © 2016-2020 Fletcher T. Penney.
 
 
-	The `MultiMarkdown 6` project is released under the MIT License..
+	MIT License
 
-	GLibFacade.c and GLibFacade.h are from the MultiMarkdown v4 project:
-
- https://github.com/fletcher/MultiMarkdown-4/
-
-	MMD 4 is released under both the MIT License and GPL.
-
-
-	CuTest is released under the zlib/libpng license. See CuTest.c for the text
-	of the license.
-
-
-	## The MIT License ##
+	Copyright (c) 2016-2020 Fletcher T. Penney
 
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
@@ -39,18 +28,18 @@
 	copies of the Software, and to permit persons to whom the Software is
 	furnished to do so, subject to the following conditions:
 
-	The above copyright notice and this permission notice shall be included in
-	all copies or substantial portions of the Software.
+	The above copyright notice and this permission notice shall be included in all
+	copies or substantial portions of the Software.
 
 	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	THE SOFTWARE.
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	SOFTWARE.
 
- */
+*/
 
 
 #ifndef STACK_SMART_STRING_H
@@ -62,7 +51,7 @@
 struct stack {
 	size_t		size;				//!< Number of objects currently in stack
 	size_t		capacity;			//!< Total current capacity for stack
-	void **		element;			//!< Array of pointers to objects in stack
+	void 	**	element;			//!< Array of pointers to objects in stack
 };
 
 typedef struct stack stack;

data/ext/mmd/textbundle.c

@@ -105,13 +105,30 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
+#ifdef __APPLE__
+	#include "TargetConditionals.h"
+	#if TARGET_IPHONE_SIMULATOR
+		// iOS Simulator
+		#undef USE_CURL
+	#elif TARGET_OS_IPHONE
+		// iOS device
+		#undef USE_CURL
+	#elif TARGET_OS_MAC
+		// Other kinds of Mac OS
+	#else
+		#   error "Unknown Apple platform"
+	#endif
+#endif
+
 #ifdef USE_CURL
 	#include <curl/curl.h>
 #endif
 
 #include "file.h"
 #include "miniz.h"
+#include "stack.h"
 #include "textbundle.h"
+#include "token.h"
 #include "writer.h"
 #include "zip.h"
 
@@ -222,7 +239,7 @@ static void add_assets(mz_zip_archive * pZip, mmd_engine * e, const char * direc
 			if (res != CURLE_OK) {
 				// Attempt to add asset from local file
 				if (!add_asset_from_file(pZip, a, destination, directory)) {
-					fprintf(stderr, "Unable to store '%s' in EPUB\n", a->url);
+					fprintf(stderr, "Unable to store '%s' in TextBundle\n", a->url);
 				}
 			} else {
 				// Store downloaded file in zip
@@ -252,7 +269,7 @@ static void add_assets(mz_zip_archive * pZip, mmd_engine * e, const char * direc
 
 			// Attempt to add asset from local file
 			if (!add_asset_from_file(pZip, a, destination, directory)) {
-				fprintf(stderr, "Unable to store '%s' in EPUB\n", a->url);
+				fprintf(stderr, "Unable to store '%s' in TextBundle\n", a->url);
 			}
 		}
 	}
@@ -273,7 +290,7 @@ void traverse_for_images(token * t, DString * text, mmd_engine * e, long * offse
 
 					memcpy(url, &text->str[t->start + *offset + 1], t->len - 2);
 					url[t->len - 2] = '\0';
-					clean = clean_string(url, false);
+					clean = clean_string(url, false, true);
 
 					HASH_FIND_STR(e->asset_hash, clean, a);
 
@@ -367,7 +384,7 @@ void sub_asset_paths(DString * text, mmd_engine * e) {
 }
 
 
-DString * textbundle_create(const char * body, mmd_engine * e, const char * directory) {
+DString * textbundle_create(DString * body, mmd_engine * e, const char * directory) {
 	DString * result = d_string_new("");
 	scratch_pad * scratch = scratch_pad_new(e, FORMAT_TEXTBUNDLE_COMPRESSED);
 
@@ -409,8 +426,7 @@ DString * textbundle_create(const char * body, mmd_engine * e, const char * dire
 	}
 
 	// Add html version document
-	len = strlen(body);
-	status = mz_zip_writer_add_mem(&zip, "text.html", body, len, MZ_BEST_COMPRESSION);
+	status = mz_zip_writer_add_mem(&zip, "text.html", body->str, body->currentStringLength, MZ_BEST_COMPRESSION);
 
 	if (!status) {
 		fprintf(stderr, "Error adding content to zip.\n");
@@ -436,7 +452,7 @@ DString * textbundle_create(const char * body, mmd_engine * e, const char * dire
 
 
 // Use the miniz library to create a zip archive for the TEXTBUNDLE_COMPRESSED document
-void textbundle_write_wrapper(const char * filepath, const char * body, mmd_engine * e, const char * directory) {
+void textbundle_write_wrapper(const char * filepath, DString * body, mmd_engine * e, const char * directory) {
 	FILE * output_stream;
 
 	DString * result = textbundle_create(body, e, directory);

data/ext/mmd/textbundle.h

@@ -108,8 +108,8 @@
 #include "d_string.h"
 #include "mmd.h"
 
-void textbundle_write_wrapper(const char * filepath, const char * body, mmd_engine * e, const char * directory);
+void textbundle_write_wrapper(const char * filepath, DString * body, mmd_engine * e, const char * directory);
 
-DString * textbundle_create(const char * body, mmd_engine * e, const char * directory);
+DString * textbundle_create(DString * body, mmd_engine * e, const char * directory);
 
 #endif

data/ext/mmd/token.c

@@ -115,17 +115,20 @@ void token_pool_free(void) {
 token * token_new(unsigned short type, size_t start, size_t len) {
 
 
-	#ifdef kUseObjectPool
+#ifdef kUseObjectPool
 	token * t = pool_allocate_object(token_pool);
-	#else
+#else
 	token * t = malloc(sizeof(token));
-	#endif
+#endif
 
 	if (t) {
 		t->type = type;
 		t->start = start;
 		t->len = len;
 
+		t->out_start = 0;
+		t->out_len = 0;
+
 		t->next = NULL;
 		t->prev = NULL;
 		t->child = NULL;
@@ -145,11 +148,11 @@ token * token_new(unsigned short type, size_t start, size_t len) {
 
 /// Duplicate an existing token
 token * token_copy(token * original) {
-	#ifdef kUseObjectPool
+#ifdef kUseObjectPool
 	token * t = pool_allocate_object(token_pool);
-	#else
+#else
 	token * t = malloc(sizeof(token));
-	#endif
+#endif
 
 	if (t) {
 		* t = * original;
@@ -276,9 +279,28 @@ void token_remove_tail(token * head) {
 }
 
 
+/// Fix tail at head of token chain (e.g. after pruning)
+void fix_token_chain_tail(token * t) {
+	if (t) {
+		token * head = t;
+
+		// Find head of chain
+		while (head->prev) {
+			head = head->prev;
+		}
+
+		// Find tail
+		while (t->next) {
+			t = t->next;
+		}
+
+		// Fix tail
+		head->tail = t;
+	}
+}
+
 /// Pop token out of it's chain, connecting head and tail of chain back together.
 /// Token must be freed if it is no longer needed.
-/// \todo: If t is the tail token of a chain, the tail is no longer correct on the start of chain.
 void token_pop_link_from_chain(token * t) {
 	if (t == NULL) {
 		return;
@@ -293,6 +315,8 @@ void token_pop_link_from_chain(token * t) {
 
 	if (prev) {
 		prev->next = next;
+
+		fix_token_chain_tail(prev);
 	}
 
 	if (next) {
@@ -312,6 +336,8 @@ void tokens_prune(token * first, token * last) {
 
 	if (prev != NULL) {
 		prev->next = next;
+
+		fix_token_chain_tail(prev);
 	}
 
 	if (next != NULL) {
@@ -387,9 +413,9 @@ token * token_prune_graft(token * first, token * last, unsigned short container_
 
 /// Free token
 void token_free(token * t) {
-	#ifdef kUseObjectPool
+#ifdef kUseObjectPool
 	return;
-	#else
+#else
 
 	if (t == NULL) {
 		return;
@@ -398,15 +424,15 @@ void token_free(token * t) {
 	token_tree_free(t->child);
 
 	free(t);
-	#endif
+#endif
 }
 
 
 /// Free token chain
 void token_tree_free(token * t) {
-	#ifdef kUseObjectPool
+#ifdef kUseObjectPool
 	return;
-	#else
+#else
 	token * n;
 
 	while (t != NULL) {
@@ -416,7 +442,7 @@ void token_tree_free(token * t) {
 		t = n;
 	}
 
-	#endif
+#endif
 }
 
 
@@ -592,7 +618,7 @@ void token_trim_leading_whitespace(token * t, const char * string) {
 
 
 void token_trim_trailing_whitespace(token * t, const char * string) {
-	while (t->len && char_is_whitespace(string[t->start + t->len - 1])) {
+	while (t->len && char_is_whitespace_or_line_ending(string[t->start + t->len - 1])) {
 		t->len--;
 	}
 }
@@ -606,7 +632,7 @@ void token_trim_whitespace(token * t, const char * string) {
 
 /// Check whether first token in the chain matches the given type.
 /// If so, return and advance the chain.
-token * token_chain_accept(token ** t, short type) {
+token * token_chain_accept(token ** t, unsigned short type) {
 	token * result = NULL;
 
 	if (t && *t && ((*t)->type == type)) {
@@ -639,7 +665,7 @@ token * token_chain_accept_multiple(token ** t, int n, ...) {
 }
 
 
-void token_skip_until_type(token ** t, short type) {
+void token_skip_until_type(token ** t, unsigned short type) {
 	while ((*t) && ((*t)->type != type)) {
 		*t = (*t)->next;
 	}

data/ext/mmd/{include/token.h → token.h}

@@ -58,7 +58,12 @@
 #define TOKEN_PARSER_TEMPLATE_H
 
 
-#define kUseObjectPoolDisabled 1		//!< Use an object pool to allocate tokens to improve
+#ifdef DISABLE_OBJECT_POOL
+	#undef kUseObjectPool
+#else
+	#define kUseObjectPool 1
+#endif
+//!< Use an object pool to allocate tokens to improve
 //!< performance in memory allocation. Frees all
 //!< tokens at once, however, at end of parsing.
 
@@ -66,6 +71,12 @@
 /// This allows us to know when the pool is no longer being used and it is safe
 /// to free.
 
+/// This is easy with a command line utility, but complex in a multithreaded
+/// application.  Unless you *really* know what you're doing, fully understand
+/// threads and C memory management, you should probably disable object pools
+/// when creating a long-running GUI application.  (I disable them in
+/// MultiMarkdown Composer, for example.)
+
 #ifdef kUseObjectPool
 	void token_pool_init(void);			//!< Initialize object pool for allocating tokens
 	void token_pool_drain(void);		//!< Drain pool to free memory when parse complete
@@ -85,13 +96,16 @@ struct token {
 	size_t				start;			//!< Starting offset in the source string
 	size_t				len;			//!< Length of the token in the source string
 
-	struct token *		next;			//!< Pointer to next token in the chain
-	struct token *		prev;			//!< Pointer to previous marker in the chain
-	struct token *		child;			//!< Pointer to child chain
+	size_t				out_start;
+	size_t				out_len;
+
+	struct token 	*	next;			//!< Pointer to next token in the chain
+	struct token 	*	prev;			//!< Pointer to previous marker in the chain
+	struct token 	*	child;			//!< Pointer to child chain
 
-	struct token *		tail;			//!< Pointer to last token in the chain
+	struct token 	*	tail;			//!< Pointer to last token in the chain
 
-	struct token *		mate;			//!< Pointer to other token in matched pair
+	struct token 	*	mate;			//!< Pointer to other token in matched pair
 };
 
 typedef struct token token;
@@ -217,11 +231,11 @@ void token_trim_whitespace(token * t, const char * string);
 
 
 ///
-token * token_chain_accept(token ** t, short type);
+token * token_chain_accept(token ** t, unsigned short type);
 
 token * token_chain_accept_multiple(token ** t, int n, ...);
 
-void token_skip_until_type(token ** t, short type);
+void token_skip_until_type(token ** t, unsigned short type);
 
 void token_skip_until_type_multiple(token ** t, int n, ...);
 

data/ext/mmd/token_pairs.c

@@ -213,9 +213,6 @@ close:
 						opener_count[peek->type]--;
 					}
 
-					#ifndef NDEBUG
-					fprintf(stderr, "stack now sized %lu\n", s->size);
-					#endif
 					// Prune matched section
 
 					if (e->should_prune[pair_type]) {
@@ -230,12 +227,6 @@ close:
 					break;
 				}
 
-				#ifndef NDEBUG
-				else {
-					fprintf(stderr, "token type %d failed to match stack element\n", walker->type);
-				}
-
-				#endif
 				i--;
 			}
 		}
@@ -246,18 +237,11 @@ open:
 		if (walker->can_open && e->can_open_pair[walker->type] && walker->unmatched) {
 			stack_push(s, walker);
 			opener_count[walker->type]++;
-			#ifndef NDEBUG
-			fprintf(stderr, "push token type %d to stack (%lu elements)\n", walker->type, s->size);
-			#endif
 		}
 
 		walker = walker->next;
 	}
 
-	#ifndef NDEBUG
-	fprintf(stderr, "token stack has %lu elements (of %lu)\n", s->size, s->capacity);
-	#endif
-
 	// Remove unused tokens from stack and return to parent
 	s->size = start_counter;
 }

data/ext/mmd/transclude.c

@@ -122,7 +122,7 @@ void mmd_transclude_source(DString * source, const char * search_path, const cha
 	// Make sure we use a parse tree for children
 	stack * parse_stack = parsed;
 
-	if (parsed == NULL) {
+	if (parse_stack == NULL) {
 		// Create temporary stack
 		parse_stack = stack_new(0);
 	}
@@ -172,12 +172,14 @@ void mmd_transclude_source(DString * source, const char * search_path, const cha
 
 			// Adjust file wildcard extension for output format
 			// e.g. `foo.*`
-			if ((format != FORMAT_MMD) && strncmp(&text[stop - start - 4], ".*", 2) == 0) {
+			if ((stop - start > 3) && (format != FORMAT_MMD) && strncmp(&text[stop - start - 4], ".*", 2) == 0) {
 				// Trim '.*'
 				d_string_erase(file_path, file_path->currentStringLength - 2, 2);
 
 				switch (format) {
 					case FORMAT_HTML:
+					case FORMAT_HTML_WITH_ASSETS:
+					case FORMAT_EPUB:
 						d_string_append(file_path, ".html");
 						break;
 
@@ -188,6 +190,8 @@ void mmd_transclude_source(DString * source, const char * search_path, const cha
 						break;
 
 					case FORMAT_FODT:
+					case FORMAT_ODT:
+						// `.fodt` is the extension for historical reasons
 						d_string_append(file_path, ".fodt");
 						break;