rmultimarkdown 6.2.2.1 → 6.4.0.1

data/ext/mmd/include/d_string.h

@@ -10,42 +10,42 @@
 
 	@author	Daniel Jalkut, modified by Fletcher T. Penney and Dan Lowe
 
-	@bug	
+	@bug
 
 **/
 
 /*
 
 	Copyright © 2011 Daniel Jalkut.
-	Modifications by Fletcher T. Penney, Copyright © 2011-2017 Fletcher T. Penney.
+	Modifications by Fletcher T. Penney, Copyright © 2011-2018 Fletcher T. Penney.
 	Modifications by Dan Lowe, Copyright © 2011 Dan Lowe.
 
 
 	The `MultiMarkdown 6` project is released under the 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 ##
-	
+
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
 	in the Software without restriction, including without limitation the rights
 	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 	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 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
@@ -63,26 +63,27 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-/* WE implement minimal mirror implementations of GLib's GString  
+/* WE implement minimal mirror implementations of GLib's GString
  * sufficient to cover the functionality required by MultiMarkdown.
  *
- * NOTE: THese are 100% clean, from-scratch implementations using only the 
+ * NOTE: THese are 100% clean, from-scratch implementations using only the
  * GLib function prototype as guide for behavior.
  */
 
 
 /// Structure for dynamic string
-typedef struct 
-{	
+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
-} DString;
+};
+
+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
 );
 
 
@@ -159,7 +160,7 @@ void d_string_insert_printf(
 void d_string_erase(
 	DString * baseString,					//!< DString to be appended
 	size_t pos,								//!< Offset at which to erase portion of string
-	size_t len								//!< Character to append
+	size_t len								//!< How many characters(bytes) to remove
 );
 
 /// Copy a portion of dynamic string

data/ext/mmd/include/libMultiMarkdown.h

@@ -8,7 +8,7 @@
 
 
 	@author	Fletcher T. Penney
-	@bug	
+	@bug
 
 
 	******IMPORTANT******
@@ -20,7 +20,7 @@
 	2. Properly manage the `token_pool_init` and `token_pool_free` functions.
 
 
-	I recommend option #1, unless you absolutely need the best performance for 
+	I recommend option #1, unless you absolutely need the best performance for
 	long documents.  Doing #2 properly is tricky in any program that can handle
 	multiple MMD text strings at overlapping times.
 
@@ -32,30 +32,30 @@
 
 
 	The `MultiMarkdown 6` project is released under the 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 ##
-	
+
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
 	in the Software without restriction, including without limitation the rights
 	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 	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 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
@@ -74,8 +74,20 @@
 #include <stdlib.h>
 
 
-#include "d_string.h"
-#include "token.h"
+/// typedefs for internal data structures.  If you intend to work with these structures
+/// in your own code, you may need to import additional header files.
+
+/// From token.h:
+typedef struct token token;
+
+/// From d_string.h:
+typedef struct DString DString;
+
+/// From mmd.h
+typedef struct mmd_engine mmd_engine;
+
+/// From stack.h
+typedef struct stack stack;
 
 
 /// There are 3 main versions of the primary functions:
@@ -181,10 +193,6 @@ struct stack * mmd_d_string_transclusion_manifest(DString * source, const char *
 	MMD Engine variants
 */
 
-/// MMD Engine is used for storing configuration information for MMD parser
-typedef struct mmd_engine mmd_engine;
-
-
 /// Create MMD Engine using an existing DString (A new copy is *not* made)
 mmd_engine * mmd_engine_create_with_dstring(
 	DString *		d,
@@ -206,8 +214,8 @@ void mmd_engine_reset(mmd_engine * e);
 
 /// Free an existing MMD Engine
 void mmd_engine_free(
-	mmd_engine * e,
-	bool freeDString
+	mmd_engine *	e,
+	bool			freeDString
 );
 
 
@@ -281,10 +289,6 @@ char * mmd_version(void);
 DString * scan_file(const char * fname);
 
 
-/// MMD Engine is used for storing configuration information for MMD parser
-typedef struct stack stack;
-
-
 /// 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, struct stack * parsed, struct stack * manifest);
@@ -302,10 +306,18 @@ void mmd_append_mmd_footer(DString * source);
 void mmd_critic_markup_accept(DString * d);
 
 
+/// Accept all CriticMarkup changes in the specified range
+void mmd_critic_markup_accept_range(DString * d, size_t start, size_t len);
+
+
 /// Reject all CriticMarkup changes in the source string
 void mmd_critic_markup_reject(DString * d);
 
 
+/// Reject all CriticMarkup changes in the specified range
+void mmd_critic_markup_reject_range(DString * d, size_t start, size_t len);
+
+
 /// Token types for parse tree
 enum token_types {
 	DOC_START_TOKEN = 0,	//!< DOC_START_TOKEN must be type 0
@@ -440,7 +452,7 @@ enum token_types {
 	HTML_COMMENT_START,
 	HTML_COMMENT_STOP,
 	PAIR_HTML_COMMENT,
-	
+
 	MATH_PAREN_OPEN,
 	MATH_PAREN_CLOSE,
 	MATH_BRACKET_OPEN,
@@ -452,7 +464,7 @@ enum token_types {
 	PIPE,
 	PLUS,
 	SLASH,
-	
+
 	SUPERSCRIPT,
 	SUBSCRIPT,
 
@@ -481,7 +493,7 @@ enum token_types {
 	TABLE_DIVIDER,
 
 	TOC,
-	
+
 	TEXT_BACKSLASH,
 	RAW_FILTER_LEFT,
 	TEXT_BRACE_LEFT,
@@ -508,6 +520,7 @@ enum smart_quotes_language {
 	FRENCH,
 	GERMAN,
 	GERMANGUILL,
+	SPANISH,
 	SWEDISH,
 };
 
@@ -522,6 +535,7 @@ enum output_format {
 	FORMAT_ODT,
 	FORMAT_TEXTBUNDLE,
 	FORMAT_TEXTBUNDLE_COMPRESSED,
+	FORMAT_OPML,
 	FORMAT_MMD,
 };
 
@@ -541,6 +555,7 @@ enum parser_extensions {
 	EXT_CRITIC_REJECT       = 1 << 11,   //!< Reject all proposed changes
 	EXT_RANDOM_FOOT         = 1 << 12,   //!< Use random numbers for footnote links
 	EXT_TRANSCLUDE          = 1 << 13,   //!< Perform transclusion(s)
+	EXT_PARSE_OPML          = 1 << 14,   //!< Convert from OPML before processing source text
 	EXT_FAKE                = 1 << 31,   //!< 31 is highest number allowed
 };
 

data/ext/mmd/include/token.h

@@ -10,7 +10,7 @@
 
 	@author	Fletcher T. Penney
 
-	@bug	
+	@bug
 
 **/
 
@@ -20,27 +20,27 @@
 
 
 	The `MultiMarkdown 6` project is released under the 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 ##
-	
+
 	Permission is hereby granted, free of charge, to any person obtaining a copy
 	of this software and associated documentation files (the "Software"), to deal
 	in the Software without restriction, including without limitation the rights
 	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 	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.
 
@@ -59,17 +59,17 @@
 
 
 #define kUseObjectPoolDisabled 1		//!< Use an object pool to allocate tokens to improve
-								//!< performance in memory allocation. Frees all
-								//!< tokens at once, however, at end of parsing.
+//!< performance in memory allocation. Frees all
+//!< tokens at once, however, at end of parsing.
 
 /// Should call init() once per thread/use, and drain() once per thread/use.
 /// This allows us to know when the pool is no longer being used and it is safe
 /// to free.
 
 #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
-void token_pool_free(void);				//!< Free the token object pool
+	void token_pool_init(void);			//!< Initialize object pool for allocating tokens
+	void token_pool_drain(void);		//!< Drain pool to free memory when parse complete
+	void token_pool_free(void);			//!< Free the token object pool
 #endif
 
 

data/ext/mmd/latex.c

@@ -116,6 +116,10 @@ void mmd_print_char_latex(DString * out, char c) {
 			print_const("\\textbar{}");
 			break;
 
+		case '\n':
+		case '\r':
+			print_char('\\');
+
 		case '#':
 		case '{':
 		case '}':
@@ -214,6 +218,7 @@ void mmd_print_localized_char_latex(DString * out, unsigned short type, scratch_
 					break;
 
 				case FRENCH:
+				case SPANISH:
 					print_const("«");
 					break;
 
@@ -238,6 +243,7 @@ void mmd_print_localized_char_latex(DString * out, unsigned short type, scratch_
 					break;
 
 				case FRENCH:
+				case SPANISH:
 					print_const("»");
 					break;
 
@@ -261,14 +267,13 @@ void mmd_export_link_latex(DString * out, const char * source, token * text, lin
 			if (text && text->child) {
 				temp_char = label_from_token(source, text);
 
-				if (strcmp(temp_char, &(link->url[1])) == 0) {
-					// [bar][bar] or [bar](#bar) or [bar]
-					printf("\\autoref{%s}", &(link->url)[1]);
-				} else {
+				if (temp_char && temp_char[0] != '\0') {
 					mmd_export_token_tree_latex(out, source, text->child, scratch);
 					print_const(" (");
 					printf("\\autoref{%s}", &(link->url)[1]);
 					print_const(")");
+				} else {
+					printf("\\autoref{%s}", &(link->url)[1]);
 				}
 
 				free(temp_char);
@@ -292,7 +297,9 @@ void mmd_export_link_latex(DString * out, const char * source, token * text, lin
 		text->child->next->len++;
 	}
 
-	mmd_export_token_tree_latex(out, source, text->child, scratch);
+	if (text && text->child) {
+		mmd_export_token_tree_latex(out, source, text->child, scratch);
+	}
 
 	print_const("}");
 
@@ -441,7 +448,7 @@ void mmd_export_toc_entry_latex(DString * out, const char * source, scratch_pad
 		if (entry_level >= level) {
 			// This entry is a direct descendant of the parent
 			temp_char = label_from_header(source, entry);
-			print_const("\\item{} ");
+			print_const("\\item ");
 			mmd_export_token_tree_latex(out, source, entry->child, scratch);
 			printf("(\\autoref{%s})\n\n", temp_char);
 
@@ -684,6 +691,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 			}
 
 			mmd_export_token_tree_latex(out, source, t->child, scratch);
+			trim_trailing_whitespace_d_string(out);
 
 			if (scratch->extensions & EXT_NO_LABELS) {
 				print_const("}");
@@ -763,7 +771,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
 		case BLOCK_LIST_ITEM:
 			pad(out, 2, scratch);
-			print_const("\\item{} ");
+			print_const("\\item ");
 			scratch->padded = 2;
 			mmd_export_token_tree_latex(out, source, t->child, scratch);
 			scratch->padded = 0;
@@ -771,7 +779,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
 		case BLOCK_LIST_ITEM_TIGHT:
 			pad(out, 2, scratch);
-			print_const("\\item{} ");
+			print_const("\\item ");
 			scratch->padded = 2;
 			mmd_export_token_tree_latex(out, source, t->child, scratch);
 			scratch->padded = 0;
@@ -798,7 +806,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 				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;
 				}
 
@@ -1026,7 +1034,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
 		case ESCAPED_CHARACTER:
 			if (!(scratch->extensions & EXT_COMPATIBILITY) &&
-			        (source[t->start + 1] == ' ')) {
+					(source[t->start + 1] == ' ')) {
 				print_const("~");
 			} else {
 				mmd_print_char_latex(out, source[t->start + 1]);
@@ -1238,7 +1246,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
 		case PAIR_BRACKET:
 			if ((scratch->extensions & EXT_NOTES) &&
-			        (t->next && t->next->type == PAIR_BRACKET_CITATION)) {
+					(t->next && t->next->type == PAIR_BRACKET_CITATION)) {
 				goto parse_citation;
 			}
 
@@ -1254,8 +1262,8 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 					temp_token = t->next;
 
 					if (temp_token &&
-					        ((temp_token->type == PAIR_BRACKET) ||
-					         (temp_token->type == PAIR_PAREN))) {
+							((temp_token->type == PAIR_BRACKET) ||
+							 (temp_token->type == PAIR_PAREN))) {
 						temp_token = temp_token->next;
 					}
 
@@ -1284,7 +1292,9 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 			}
 
 			// No links exist, so treat as normal
+			print_const("{");
 			mmd_export_token_tree_latex(out, source, t->child, scratch);
+			print_const("}");
 			break;
 
 		case PAIR_BRACKET_ABBREVIATION:
@@ -1299,9 +1309,9 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 
 				if (temp_short == -1) {
 					// This instance is not properly formed
-					print_const("[>");
+					print_const("{[>");
 					mmd_export_token_tree_latex(out, source, t->child->next, scratch);
-					print_const("]");
+					print_const("]}");
 					break;
 				}
 
@@ -1325,7 +1335,9 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 				}
 			} else {
 				// Note-based syntax disabled
+				print_const("{");
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
+				print_const("}");
 			}
 
 			break;
@@ -1366,9 +1378,9 @@ parse_citation:
 					// Ensure we aren't using BibTeX
 					if (!scratch->bibtex_file) {
 						// This instance is not properly formed
-						print_const("[#");
+						print_const("{[#");
 						mmd_export_token_tree_latex(out, source, t->child->next, scratch);
-						print_const("]");
+						print_const("]}");
 
 						free(temp_char);
 						break;
@@ -1448,7 +1460,9 @@ parse_citation:
 				free(temp_char);
 			} else {
 				// Note-based syntax disabled
+				print_const("{");
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
+				print_const("}");
 			}
 
 			break;
@@ -1463,9 +1477,9 @@ parse_citation:
 
 				if (temp_short == -1) {
 					// This instance is not properly formed
-					print_const("[?");
+					print_const("{[?");
 					mmd_export_token_tree_latex(out, source, t->child->next, scratch);
-					print_const("]");
+					print_const("]}");
 					break;
 				}
 
@@ -1488,16 +1502,18 @@ parse_citation:
 					print_const("}");
 				} else {
 					// This is the first time this note was used
-
 					print_const("\\footnote{");
 					temp_note = stack_peek_index(scratch->used_footnotes, temp_short - 1);
-
+					// Reset padding counter in case of multiple footnotes in single paragraph
+					scratch->padded = 2;
 					mmd_export_token_tree_latex(out, source, temp_note->content, scratch);
 					print_const("}");
 				}
 			} else {
 				// Note-based syntax disabled
+				print_const("{");
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
+				print_const("}");
 			}
 
 			break;
@@ -1515,7 +1531,7 @@ parse_citation:
 
 				if (temp_short == -1) {
 					// This instance is not properly formed
-					print_const("[?");
+					print_const("{[?");
 
 					if (t->child) {
 						mmd_export_token_tree_latex(out, source, t->child->next, scratch);
@@ -1523,7 +1539,7 @@ parse_citation:
 						print_token(t);
 					}
 
-					print_const("]");
+					print_const("]}");
 					break;
 				}
 
@@ -1563,7 +1579,9 @@ parse_citation:
 				}
 			} else {
 				// Note-based syntax disabled
+				print_const("{");
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
+				print_const("}");
 			}
 
 			break;
@@ -1575,7 +1593,9 @@ parse_citation:
 			if (temp_char2) {
 				mmd_print_string_latex(out, temp_char2);
 			} else {
+				print_const("{");
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
+				print_const("}");
 			}
 
 			// Don't free temp_char2 (it belongs to meta *)
@@ -1634,7 +1654,7 @@ parse_citation:
 
 			// Ignore if we're rejecting or accepting
 			if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-			        (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+					(scratch->extensions & EXT_CRITIC_ACCEPT)) {
 				break;
 			}
 
@@ -1654,7 +1674,7 @@ parse_citation:
 
 			// Ignore if we're rejecting or accepting
 			if ((scratch->extensions & EXT_CRITIC_REJECT) ||
-			        (scratch->extensions & EXT_CRITIC_ACCEPT)) {
+					(scratch->extensions & EXT_CRITIC_ACCEPT)) {
 				t->child->type = TEXT_EMPTY;
 				t->child->mate->type = TEXT_EMPTY;
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
@@ -1684,8 +1704,8 @@ parse_citation:
 
 		case PAIR_CRITIC_SUB_DEL:
 			if ((scratch->extensions & EXT_CRITIC) &&
-			        (t->next) &&
-			        (t->next->type == PAIR_CRITIC_SUB_ADD)) {
+					(t->next) &&
+					(t->next->type == PAIR_CRITIC_SUB_ADD)) {
 				t->child->type = TEXT_EMPTY;
 				t->child->mate->type = TEXT_EMPTY;
 
@@ -1706,8 +1726,8 @@ parse_citation:
 
 		case PAIR_CRITIC_SUB_ADD:
 			if ((scratch->extensions & EXT_CRITIC) &&
-			        (t->prev) &&
-			        (t->prev->type == PAIR_CRITIC_SUB_DEL)) {
+					(t->prev) &&
+					(t->prev->type == PAIR_CRITIC_SUB_DEL)) {
 				t->child->type = TEXT_EMPTY;
 				t->child->mate->type = TEXT_EMPTY;
 
@@ -1930,6 +1950,7 @@ parse_citation:
 		case TEXT_BRACE_RIGHT:
 			print_const("\\");
 
+		case PAIR_RAW_FILTER:
 		case RAW_FILTER_LEFT:
 		case TEXT_NUMBER_POSS_LIST:
 		case TEXT_PERIOD:
@@ -1981,6 +2002,8 @@ void mmd_export_token_latex_raw(DString * out, const char * source, token * t, s
 		return;
 	}
 
+	char * temp;
+
 	switch (t->type) {
 		case ESCAPED_CHARACTER:
 			print_const("\\");
@@ -1992,6 +2015,27 @@ void mmd_export_token_latex_raw(DString * out, const char * source, token * t, s
 			print_token(t);
 			break;
 
+		case MARKER_LIST_BULLET:
+		case MARKER_LIST_ENUMERATOR:
+			print_token(t);
+
+			temp = NULL;
+
+			if (t->next) {
+				temp = (char *) &source[t->next->start];
+			}
+
+			source = (char *) &source[t->start + t->len];
+
+			while (char_is_whitespace(*source) &&
+					((temp == NULL) ||
+					 (source < temp))) {
+				print_char(*source);
+				source++;
+			}
+
+			break;
+
 		case SUBSCRIPT:
 			if (t->child) {
 				print_const("\\ensuremath{\\sim}");
@@ -2020,6 +2064,10 @@ void mmd_export_token_latex_raw(DString * out, const char * source, token * t, s
 		case TEXT_EMPTY:
 			break;
 
+		case TEXT_PERCENT:
+			print_const("\\%");
+			break;
+
 		default:
 			if (t->child) {
 				mmd_export_token_tree_latex_raw(out, source, t->child, scratch);
@@ -2133,7 +2181,23 @@ void mmd_export_token_latex_tt(DString * out, const char * source, token * t, sc
 
 		case ESCAPED_CHARACTER:
 			print_const("\\textbackslash{}");
-			mmd_print_char_latex(out, source[t->start + 1]);
+
+			if (t->next && t->next->type == TEXT_EMPTY && source[t->start + 1] == ' ') {
+			} else {
+				mmd_print_char_latex(out, source[t->start + 1]);
+			}
+
+			break;
+
+		case HASH1:
+		case HASH2:
+		case HASH3:
+		case HASH4:
+		case HASH5:
+		case HASH6:
+		case TEXT_HASH:
+			print_const("\\");
+			print_token(t);
 			break;
 
 		case HTML_ENTITY:
@@ -2152,6 +2216,14 @@ void mmd_export_token_latex_tt(DString * out, const char * source, token * t, sc
 				t->next->type = TEXT_EMPTY;
 			}
 
+		case MATH_DOLLAR_SINGLE:
+			print_const("\\$");
+			break;
+
+		case MATH_DOLLAR_DOUBLE:
+			print_const("\\$\\$");
+			break;
+
 		case MATH_BRACKET_OPEN:
 		case MATH_BRACKET_CLOSE:
 		case MATH_PAREN_OPEN:
@@ -2207,6 +2279,10 @@ void mmd_export_token_latex_tt(DString * out, const char * source, token * t, sc
 			print_const("\\}");
 			break;
 
+		case TEXT_PERCENT:
+			print_const("\\%");
+			break;
+
 		case TOC:
 			print_const("\\{\\{TOC\\}\\}");
 			break;
@@ -2321,6 +2397,7 @@ void mmd_start_complete_latex(DString * out, const char * source, scratch_pad *
 		} else if (strcmp(m->key, "latexmode") == 0) {
 		} else if (strcmp(m->key, "mmdfooter") == 0) {
 		} else if (strcmp(m->key, "mmdheader") == 0) {
+		} else if (strcmp(m->key, "odfheader") == 0) {
 		} else if (strcmp(m->key, "quoteslanguage") == 0) {
 		} else if (strcmp(m->key, "title") == 0) {
 			print_const("\\def\\mytitle{");