rmultimarkdown 6.4.0.3 → 6.7.0.0

data/ext/mmd/d_string.c

@@ -1,11 +1,12 @@
 /**
 
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
+	Dynamic string -- Lightweight dynamic string implementation.
 
 	@file d_string.c
 
-	@brief Dynamic string -- refactoring of old GLibFacade.  Provides a string
-	"object" that can grow to accomodate any size content that is appended.
+	@brief Dynamic string -- refactoring of old GLibFacade from MultiMarkdown.
+	Provides a string "object" that can grow to accomodate any size content
+	that is appended.
 
 
 	@author	Daniel Jalkut, modified by Fletcher T. Penney and Dan Lowe
@@ -17,7 +18,7 @@
 /*
 
 	Copyright © 2011 Daniel Jalkut.
-	Modifications by Fletcher T. Penney, Copyright © 2011-2018 Fletcher T. Penney.
+	Modifications by Fletcher T. Penney, Copyright © 2011-2020 Fletcher T. Penney.
 	Modifications by Dan Lowe, Copyright © 2011 Dan Lowe.
 
 
@@ -84,17 +85,17 @@
 // Some operating systems do not supply vasprintf() -- standardize on this
 // replacement from:
 //		https://github.com/esp8266/Arduino/issues/1954
-int vasprintf(char** strp, const char* fmt, va_list ap) {
+int vasprintf(char ** strp, const char * fmt, va_list ap) {
 	va_list ap2;
 	va_copy(ap2, ap);
 
-	#if (defined(_WIN32) || defined(__WIN32__))
-	char *tmp = NULL;
+#if (defined(_WIN32) || defined(__WIN32__))
+	char * tmp = NULL;
 	int size = vsnprintf(tmp, 0, fmt, ap2);
-	#else
+#else
 	char tmp[1];
 	int size = vsnprintf(tmp, 1, fmt, ap2);
-	#endif
+#endif
 
 	if (size <= 0) {
 		return size;
@@ -102,7 +103,7 @@ int vasprintf(char** strp, const char* fmt, va_list ap) {
 
 	va_end(ap2);
 	size += 1;
-	*strp = (char*)malloc(size * sizeof(char));
+	*strp = (char *)malloc(size * sizeof(char));
 	return vsnprintf(*strp, size, fmt, ap);
 }
 
@@ -115,8 +116,8 @@ int vasprintf(char** strp, const char* fmt, va_list ap) {
 
 
 /// Create a new dynamic string
-DString* d_string_new(const char * startingString) {
-	DString* newString = malloc(sizeof(DString));
+DString * d_string_new(const char * startingString) {
+	DString * newString = malloc(sizeof(DString));
 
 	if (!newString) {
 		return NULL;
@@ -150,7 +151,7 @@ DString* d_string_new(const char * startingString) {
 
 
 #ifdef TEST
-void Test_d_string_new(CuTest* tc) {
+void Test_d_string_new(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -175,12 +176,12 @@ void Test_d_string_new(CuTest* tc) {
 
 
 /// Free dynamic string
-char* d_string_free(DString * ripString, bool freeCharacterData) {
+char * d_string_free(DString * ripString, bool freeCharacterData) {
 	if (ripString == NULL) {
 		return NULL;
 	}
 
-	char* returnedString = ripString->str;
+	char * returnedString = ripString->str;
 
 	if (freeCharacterData) {
 		if (ripString->str != NULL) {
@@ -212,7 +213,7 @@ static void ensureStringBufferCanHold(DString * baseString, size_t newStringSize
 				}
 			}
 
-			char *temp;
+			char * temp;
 			temp = realloc(baseString->str, newBufferSize);
 
 			if (temp == NULL) {
@@ -230,7 +231,7 @@ static void ensureStringBufferCanHold(DString * baseString, size_t newStringSize
 
 
 #ifdef TEST
-void Test_ensureStringBufferCanHold(CuTest* tc) {
+void Test_ensureStringBufferCanHold(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -276,7 +277,7 @@ void d_string_append(DString * baseString, const char * appendedString) {
 
 
 #ifdef TEST
-void Test_d_string_append(CuTest* tc) {
+void Test_d_string_append(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -311,7 +312,7 @@ void d_string_append_c(DString * baseString, char appendedCharacter) {
 
 
 #ifdef TEST
-void Test_d_string_append_c(CuTest* tc) {
+void Test_d_string_append_c(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -342,10 +343,10 @@ void d_string_append_c_array(DString * baseString, const char * appendedChars, s
 				size_t newSizeNeeded = baseString->currentStringLength + bytes;
 				ensureStringBufferCanHold(baseString, newSizeNeeded);
 
-				memcpy(baseString->str + baseString->currentStringLength, appendedChars, bytes);
+				memcpy((void *)baseString->str + baseString->currentStringLength, appendedChars, bytes);
 
 				baseString->currentStringLength = newSizeNeeded;
-				baseString->str[baseString->currentStringLength] = '\0';
+				baseString->str[newSizeNeeded] = '\0';
 			}
 		}
 	}
@@ -353,7 +354,7 @@ void d_string_append_c_array(DString * baseString, const char * appendedChars, s
 
 
 #ifdef TEST
-void Test_d_string_append_c_array(CuTest* tc) {
+void Test_d_string_append_c_array(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -387,7 +388,7 @@ void d_string_append_printf(DString * baseString, const char * format, ...) {
 		va_list args;
 		va_start(args, format);
 
-		char* formattedString = NULL;
+		char * formattedString = NULL;
 		vasprintf(&formattedString, format, args);
 
 		if (formattedString != NULL) {
@@ -401,7 +402,7 @@ void d_string_append_printf(DString * baseString, const char * format, ...) {
 
 
 #ifdef TEST
-void Test_d_string_append_printf(CuTest* tc) {
+void Test_d_string_append_printf(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -444,7 +445,7 @@ void d_string_prepend(DString * baseString, const char * prependedString) {
 
 
 #ifdef TEST
-void Test_d_string_prepend(CuTest* tc) {
+void Test_d_string_prepend(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -488,7 +489,7 @@ void d_string_insert(DString * baseString, size_t pos, const char * insertedStri
 
 
 #ifdef TEST
-void Test_d_string_insert(CuTest* tc) {
+void Test_d_string_insert(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -533,7 +534,7 @@ void d_string_insert_c(DString * baseString, size_t pos, char insertedCharacter)
 
 
 #ifdef TEST
-void Test_d_string_insert_c(CuTest* tc) {
+void Test_d_string_insert_c(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -557,13 +558,62 @@ void Test_d_string_insert_c(CuTest* tc) {
 #endif
 
 
+/// Insert array of characters inside dynamic string
+void d_string_insert_c_array(DString * baseString, size_t pos, const char * insertedString, size_t bytes) {
+	if (baseString && insertedString) {
+		if (bytes == -1) {
+			// Same as regular insertion
+			d_string_insert(baseString, pos, insertedString);
+		} else {
+			if (pos > baseString->currentStringLength) {
+				pos = baseString->currentStringLength;
+			}
+
+			size_t newSizeNeeded = baseString->currentStringLength + bytes;
+			ensureStringBufferCanHold(baseString, newSizeNeeded);
+
+			/* Shift following string to 'right' */
+			memmove(baseString->str + pos + bytes, baseString->str + pos, baseString->currentStringLength - pos);
+			strncpy(baseString->str + pos, insertedString, bytes);
+			baseString->currentStringLength = newSizeNeeded;
+			baseString->str[baseString->currentStringLength] = '\0';
+		}
+	}
+}
+
+
+#ifdef TEST
+void Test_d_string_insert_c_array(CuTest * tc) {
+	char * test = "foo";
+
+	DString * result = d_string_new(test);
+
+	d_string_insert_c_array(result, 2, "bar", 2);
+	CuAssertStrEquals(tc, "fobao", result->str);
+	CuAssertIntEquals(tc, 5, result->currentStringLength);
+
+	d_string_insert_c_array(result, -1, "bar", 3);
+	CuAssertStrEquals(tc, "fobaobar", result->str);
+	CuAssertIntEquals(tc, 8, result->currentStringLength);
+
+	d_string_insert_c_array(result, -1, NULL, -1);
+	CuAssertStrEquals(tc, "fobaobar", result->str);
+	CuAssertIntEquals(tc, 8, result->currentStringLength);
+
+	d_string_insert_c_array(NULL, 0, NULL, -1);
+
+	d_string_free(result, true);
+}
+#endif
+
+
 /// Insert inside dynamic string using format specifier
 void d_string_insert_printf(DString * baseString, size_t pos, const char * format, ...) {
 	if (baseString && format) {
 		va_list args;
 		va_start(args, format);
 
-		char* formattedString = NULL;
+		char * formattedString = NULL;
 		vasprintf(&formattedString, format, args);
 
 		if (formattedString != NULL) {
@@ -577,7 +627,7 @@ void d_string_insert_printf(DString * baseString, size_t pos, const char * forma
 
 
 #ifdef TEST
-void Test_d_string_insert_printf(CuTest* tc) {
+void Test_d_string_insert_printf(CuTest * tc) {
 	char * test = "foo";
 
 	DString * result = d_string_new(test);
@@ -621,7 +671,7 @@ void d_string_erase(DString * baseString, size_t pos, size_t len) {
 
 
 #ifdef TEST
-void Test_d_string_erase(CuTest* tc) {
+void Test_d_string_erase(CuTest * tc) {
 	char * test = "foobar";
 
 	DString * result = d_string_new(test);
@@ -677,7 +727,7 @@ char * d_string_copy_substring(DString * d, size_t start, size_t len) {
 
 
 #ifdef TEST
-void Test_d_string_copy_substring(CuTest* tc) {
+void Test_d_string_copy_substring(CuTest * tc) {
 	char * test = "foobar";
 
 	DString * result = d_string_new(test);
@@ -712,6 +762,11 @@ long d_string_replace_text_in_range(DString * d, size_t pos, size_t len, const c
 	if (d && original && replace) {
 		long delta = 0;		// Overall change in length
 
+		if (pos > d->currentStringLength) {
+			// Out of range
+			return 0;
+		}
+
 		long len_o = strlen(original);
 		long len_r = strlen(replace);
 		long change = len_r - len_o;	// Change in length for each replacement
@@ -748,7 +803,7 @@ long d_string_replace_text_in_range(DString * d, size_t pos, size_t len, const c
 
 
 #ifdef TEST
-void Test_d_string_replace_text_in_range(CuTest* tc) {
+void Test_d_string_replace_text_in_range(CuTest * tc) {
 	char * test = "foobarfoobarfoo";
 	long delta = 0;
 
@@ -783,3 +838,4 @@ void Test_d_string_replace_text_in_range(CuTest* tc) {
 	d_string_free(result, true);
 }
 #endif
+

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

@@ -1,11 +1,12 @@
 /**
 
-	MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more.
+	Dynamic string -- Lightweight dynamic string implementation.
 
 	@file d_string.h
 
-	@brief Dynamic string -- refactoring of old GLibFacade.  Provides a string
-	"object" that can grow to accomodate any size content that is appended.
+	@brief Dynamic string -- refactoring of old GLibFacade from MultiMarkdown.
+	Provides a string "object" that can grow to accomodate any size content
+	that is appended.
 
 
 	@author	Daniel Jalkut, modified by Fletcher T. Penney and Dan Lowe
@@ -17,7 +18,7 @@
 /*
 
 	Copyright © 2011 Daniel Jalkut.
-	Modifications by Fletcher T. Penney, Copyright © 2011-2018 Fletcher T. Penney.
+	Modifications by Fletcher T. Penney, Copyright © 2011-2020 Fletcher T. Penney.
 	Modifications by Dan Lowe, Copyright © 2011 Dan Lowe.
 
 
@@ -73,9 +74,9 @@
 
 /// Structure for dynamic string
 struct DString {
-	char * str;								//!< Pointer to UTF-8 byte stream for string
-	unsigned long currentStringBufferSize;	//!< Size of buffer currently allocated
-	unsigned long currentStringLength;		//!< Size of current string
+	char * str;                             //!< Pointer to UTF-8 byte stream for string
+	unsigned long currentStringBufferSize;  //!< Size of buffer currently allocated
+	unsigned long currentStringLength;      //!< Size of current string
 };
 
 typedef struct DString DString;
@@ -83,93 +84,104 @@ typedef struct DString DString;
 
 /// Create a new dynamic string
 DString * d_string_new(
-	const char * startingString				//!< Initial contents for string
+	const char * startingString             //!< Initial contents for string
 );
 
 
 /// Free dynamic string
 char * d_string_free(
-	DString * ripString,					//!< DString to be freed
-	bool freeCharacterData					//!< Should the underlying str be freed as well?
+	DString * ripString,                    //!< DString to be freed
+	bool freeCharacterData                  //!< Should the underlying str be freed as well?
 );
 
 
 /// Append null-terminated string to end of dynamic string
 void d_string_append(
-	DString * baseString,					//!< DString to be appended
-	const char * appendedString				//!< String to be appended
+	DString * baseString,                   //!< DString to be appended
+	const char * appendedString             //!< String to be appended
 );
 
 
 /// Append single character to end of dynamic string
 void d_string_append_c(
-	DString * baseString,					//!< DString to be appended
-	char appendedCharacter					//!< Character to append
+	DString * baseString,                   //!< DString to be appended
+	char appendedCharacter                  //!< Character to append
 );
 
 
 /// Append array of characters to end of dynamic string
 void d_string_append_c_array(
-	DString * baseString,					//!< DString to be appended
-	const char * appendedChars,				//!< String to be appended
-	size_t bytes							//!< Number of bytes to append
+	DString * baseString,                   //!< DString to be appended
+	const char * appendedChars,             //!< String to be appended
+	size_t bytes                            //!< Number of bytes to append
 );
 
 
 /// Append to end of dynamic string using format specifier
 void d_string_append_printf(
-	DString * baseString,					//!< DString to be appended
-	const char * format,					//!< Format specifier for appending
-	...										//!< Arguments for format specifier
+	DString * baseString,                   //!< DString to be appended
+	const char * format,                    //!< Format specifier for appending
+	...                                     //!< Arguments for format specifier
 );
 
 
 /// Prepend null-terminated string to end of dynamic string
 void d_string_prepend(
-	DString * baseString,					//!< DString to be appended
-	const char * prependedString			//!< String to be prepended
+	DString * baseString,                   //!< DString to be appended
+	const char * prependedString            //!< String to be prepended
 );
 
 
 /// Insert null-terminated string inside dynamic string
 void d_string_insert(
-	DString * baseString,					//!< DString to be appended
-	size_t pos,								//!< Offset at which to insert string
-	const char * insertedString				//!< String to be inserted
+	DString * baseString,                   //!< DString to be appended
+	size_t pos,                             //!< Offset at which to insert string
+	const char * insertedString             //!< String to be inserted
 );
 
 
 /// Insert single character inside dynamic string
 void d_string_insert_c(
-	DString * baseString,					//!< DString to be appended
-	size_t pos,								//!< Offset at which to insert string
-	char insertedCharacter					//!< Character to insert
+	DString * baseString,                   //!< DString to be appended
+	size_t pos,                             //!< Offset at which to insert string
+	char insertedCharacter                  //!< Character to insert
+);
+
+
+/// Insert array of characters inside dynamic string
+void d_string_insert_c_array(
+	DString * baseString,                   //!< DString to be appended
+	size_t pos,                             //!< Offset at which to insert string
+	const char * insertedString,            //!< String to be inserted
+	size_t bytes                            //!< Number of bytes to insert
 );
 
 
 /// Insert inside dynamic string using format specifier
 void d_string_insert_printf(
-	DString * baseString,					//!< DString to be appended
-	size_t pos,								//!< Offset at which to insert string
-	const char * format,					//!< Format specifier for appending
-	...										//!< Arguments for format specifier
+	DString * baseString,                   //!< DString to be appended
+	size_t pos,                             //!< Offset at which to insert string
+	const char * format,                    //!< Format specifier for appending
+	...                                     //!< Arguments for format specifier
 );
 
 
 /// Erase portion of dynamic string
 void d_string_erase(
-	DString * baseString,					//!< DString to be appended
-	size_t pos,								//!< Offset at which to erase portion of string
-	size_t len								//!< How many characters(bytes) to remove
+	DString * baseString,                   //!< DString to be appended
+	size_t pos,                             //!< Offset at which to erase portion of string
+	size_t len                              //!< Character to append
 );
 
+
 /// Copy a portion of dynamic string
 char * d_string_copy_substring(
-	DString * d,							//!< DString to copy
-	size_t start,							//!< Start position for copy
-	size_t len								//!< How many characters(bytes) to copy
+	DString * d,                            //!< DString to copy
+	size_t start,                           //!< Start position for copy
+	size_t len                              //!< How many characters(bytes) to copy
 );
 
+
 /// Replace occurences of "original" with "replace" inside the specified range
 /// Returns the change in overall length
 long d_string_replace_text_in_range(

data/ext/mmd/epub.c

@@ -58,6 +58,21 @@
 #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
@@ -67,6 +82,7 @@
 #include "html.h"
 #include "i18n.h"
 #include "miniz.h"
+#include "stack.h"
 #include "uuid.h"
 #include "writer.h"
 #include "zip.h"
@@ -133,7 +149,7 @@ char * epub_package_document(scratch_pad * scratch) {
 
 	if (m) {
 		print_const("<dc:identifier id=\"pub-id\">urn:uuid:");
-		mmd_print_string_html(out, m->value, false);
+		mmd_print_string_html(out, m->value, false, false);
 		print_const("</dc:identifier>\n");
 	} else {
 		print_const("<dc:identifier id=\"pub-id\">urn:uuid:");
@@ -149,7 +165,7 @@ char * epub_package_document(scratch_pad * scratch) {
 
 	if (m) {
 		print_const("<dc:title>");
-		mmd_print_string_html(out, m->value, false);
+		mmd_print_string_html(out, m->value, false, false);
 		print_const("</dc:title>\n");
 	} else {
 		print_const("<dc:title>Untitled</dc:title>\n");
@@ -160,7 +176,7 @@ char * epub_package_document(scratch_pad * scratch) {
 
 	if (m) {
 		print_const("<dc:creator>");
-		mmd_print_string_html(out, m->value, false);
+		mmd_print_string_html(out, m->value, false, false);
 		print_const("</dc:creator>\n");
 	}
 
@@ -170,7 +186,7 @@ char * epub_package_document(scratch_pad * scratch) {
 
 	if (m) {
 		print_const("<dc:language>");
-		mmd_print_string_html(out, m->value, false);
+		mmd_print_string_html(out, m->value, false, false);
 		print_const("</dc:language>\n");
 	} else {
 		switch (scratch->language) {
@@ -194,6 +210,10 @@ char * epub_package_document(scratch_pad * scratch) {
 				print_const("<dc:language>sv</dc:language>\n");
 				break;
 
+			case LC_HE:
+				print_const("<dc:language>he</dc:language>\n");
+				break;
+
 			default:
 				print_const("<dc:language>en</dc:language>\n");
 		}
@@ -204,7 +224,7 @@ char * epub_package_document(scratch_pad * scratch) {
 
 	if (m) {
 		print_const("<meta property=\"dcterms:modified\">");
-		mmd_print_string_html(out, m->value, false);
+		mmd_print_string_html(out, m->value, false, false);
 		print_const("</meta>\n");
 	} else {
 		time_t t = time(NULL);
@@ -251,7 +271,8 @@ void epub_export_nav_entry(DString * out, const char * source, scratch_pad * scr
 
 		if (entry_level >= level) {
 			// This entry is a direct descendant of the parent
-			temp_char = label_from_header(source, entry);
+			scratch->label_counter = (int) * counter;
+			temp_char = label_from_header(source, entry, scratch);
 			printf("<li><a href=\"main.xhtml#%s\">", temp_char);
 			mmd_export_token_tree_html(out, source, entry->child, scratch);
 			print_const("</a>");
@@ -287,8 +308,11 @@ void epub_export_nav_entry(DString * out, const char * source, scratch_pad * scr
 void epub_export_nav(DString * out, mmd_engine * e, scratch_pad * scratch) {
 	size_t counter = 0;
 
+	int old_label_counter = scratch->label_counter;
 
 	epub_export_nav_entry(out, e->dstr->str, scratch, &counter, 0);
+
+	scratch->label_counter = old_label_counter;
 }
 
 
@@ -303,7 +327,7 @@ char * epub_nav(mmd_engine * e, scratch_pad * scratch) {
 	HASH_FIND_STR(scratch->meta_hash, "title", temp);
 
 	if (temp) {
-		mmd_print_string_html(out, temp->value, false);
+		mmd_print_string_html(out, temp->value, false, false);
 	} else {
 		print_const("Untitled");
 	}
@@ -452,7 +476,7 @@ static void add_assets(mz_zip_archive * pZip, mmd_engine * e, const char * direc
 
 
 // Use the miniz library to create a zip archive for the EPUB document
-void epub_write_wrapper(const char * filepath, const char * body, mmd_engine * e, const char * directory) {
+void epub_write_wrapper(const char * filepath, DString * body, mmd_engine * e, const char * directory) {
 	FILE * output_stream;
 
 	DString * result = epub_create(body, e, directory);
@@ -469,9 +493,10 @@ void epub_write_wrapper(const char * filepath, const char * body, mmd_engine * e
 }
 
 
-DString * epub_create(const char * body, mmd_engine * e, const char * directory) {
+DString * epub_create(DString * body, mmd_engine * e, const char * directory) {
 	DString * result = d_string_new("");
 	scratch_pad * scratch = scratch_pad_new(e, FORMAT_EPUB);
+	scratch->random_seed_base_labels = e->random_seed_base_labels;
 
 	mz_bool status;
 	char * data;
@@ -534,8 +559,7 @@ DString * epub_create(const char * body, mmd_engine * e, const char * directory)
 	}
 
 	// Add main document
-	len = strlen(body);
-	status = mz_zip_writer_add_mem(&zip, "OEBPS/main.xhtml", body, len, MZ_BEST_COMPRESSION);
+	status = mz_zip_writer_add_mem(&zip, "OEBPS/main.xhtml", body->str, body->currentStringLength, MZ_BEST_COMPRESSION);
 
 	if (!status) {
 		fprintf(stderr, "Error adding asset to zip.\n");
@@ -552,7 +576,7 @@ DString * epub_create(const char * body, mmd_engine * e, const char * directory)
 	status = mz_zip_writer_finalize_heap_archive(&zip, (void **) & (result->str), (size_t *) & (result->currentStringLength));
 
 	if (!status) {
-		fprintf(stderr, "Error adding asset to zip.\n");
+		fprintf(stderr, "Error finalizing zip archive.\n");
 	}
 
 	return result;

data/ext/mmd/epub.h

@@ -61,9 +61,9 @@
 #include "d_string.h"
 #include "mmd.h"
 
-void epub_write_wrapper(const char * root_path, const char * body, mmd_engine * e, const char * directory);
+void epub_write_wrapper(const char * root_path, DString * body, mmd_engine * e, const char * directory);
 
-DString * epub_create(const char * body, mmd_engine * e, const char * directory);
+DString * epub_create(DString * body, mmd_engine * e, const char * directory);
 
 
 #endif