From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Thu, 16 Feb 2017 01:35:37 +0000 (-0500)
Subject: ADDED: Custom LaTeX output for CriticMarkup comments
X-Git-Tag: 0.3.1a^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=055927d03ccfc0f3d4d5ce4fac8c62cf7b52b9c4;p=multimarkdown

ADDED: Custom LaTeX output for CriticMarkup comments
---

diff --git a/src/beamer.c b/src/beamer.c
index 9e2855a..866d803 100644
--- a/src/beamer.c
+++ b/src/beamer.c
@@ -155,7 +155,9 @@ void mmd_export_token_beamer(DString * out, const char * source, token * t, scra
 					temp_char = label_from_token(source, t);
 				}
 				printf("}\n\\label{%s}", temp_char);
-				free(temp_char);
+	
+				if (temp_char)
+					free(temp_char);
 			}
 			scratch->padded = 0;
 			break;
diff --git a/src/latex.c b/src/latex.c
index ed627d6..d0493d1 100644
--- a/src/latex.c
+++ b/src/latex.c
@@ -1190,7 +1190,7 @@ void mmd_export_token_latex(DString * out, const char * source, token * t, scrat
 			if (scratch->extensions & EXT_CRITIC) {
 				t->child->type = TEXT_EMPTY;
 				t->child->mate->type = TEXT_EMPTY;
-				print("\\todo{");
+				print("\\cmnote{");
 				mmd_export_token_tree_latex(out, source, t->child, scratch);
 				print("}");
 			} else {
diff --git a/src/main.c b/src/main.c
index 2e4da5a..1a9723d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -331,6 +331,8 @@ int main(int argc, char** argv) {
 		// Batch process 1 or more files
 		for (int i = 0; i < a_file->count; ++i)
 		{
+			token_pool_drain();
+
 			buffer = scan_file(a_file->filename[i]);
 
 			if (buffer == NULL) {
@@ -357,7 +359,7 @@ int main(int argc, char** argv) {
 
 				transclude_source(buffer, folder, format, NULL, NULL);
 	
-				free(folder);
+				//free(folder);
 			}
 	
 			result = mmd_process(buffer, extensions, format, language);
diff --git a/src/transclude.c b/src/transclude.c
index 885e21a..5ecaf0c 100644
--- a/src/transclude.c
+++ b/src/transclude.c
@@ -108,7 +108,7 @@ void add_trailing_sep(DString * path) {
 }
 
 /// Combine directory and base filename to create a full path */
-char * path_from_dir_base(char * dir, char * base) {
+char * path_from_dir_base(const char * dir, const char * base) {
 	if (!dir && !base)
 		return NULL;
 
@@ -249,7 +249,7 @@ DString * scan_file(const char * fname) {
 
 /// Recursively transclude source text, given a search directory.
 /// Track files to prevent infinite recursive loops
-void transclude_source(DString * source, char * dir, short format, stack * parsed, stack * manifest) {
+void transclude_source(DString * source, const char * dir, short format, stack * parsed, stack * manifest) {
 	DString * file_path;
 	DString * buffer;
 
diff --git a/src/transclude.h b/src/transclude.h
index c53c6a4..58f50e5 100644
--- a/src/transclude.h
+++ b/src/transclude.h
@@ -64,11 +64,11 @@
 
 
 /// Combine directory and base filename to create a full path */
-char * path_from_dir_base(char * dir, char * base);
+char * path_from_dir_base(const char * dir, const char * base);
 
 /// Recursively transclude source text, given a search directory.
 /// Track files to prevent infinite recursive loops
-void transclude_source(DString * source, char * dir, short format, stack * parsed, stack * manifest);
+void transclude_source(DString * source, const char * dir, short format, stack * parsed, stack * manifest);
 
 
 #endif
diff --git a/tests/MMD6Tests/Integrated.tex b/tests/MMD6Tests/Integrated.tex
index 073e2d6..fbcbb1e 100644
--- a/tests/MMD6Tests/Integrated.tex
+++ b/tests/MMD6Tests/Integrated.tex
@@ -104,7 +104,7 @@ $${x}_{1,2}=\frac{-b\pm \sqrt{{b}^{2}-4ac}}{2a}$$
 
 \sout{foo}\underline{bar}
 
-\todo{foo}
+\cmnote{foo}
 
 \hl{bar}