ADDED: Custom LaTeX output for CriticMarkup comments

diff --git a/src/beamer.c b/src/beamer.c
index 9e2855abb17d5a63099a9f253fdf70504b2b8bbb..866d803473fe5cd22709b50381542a5a19a6486c 100644 (file)
--- 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 ed627d68a8d54bfb72fd6e32d713337d59facf2e..d0493d1738d92599e8b5277205fffcd1c9b18537 100644 (file)
--- 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 2e4da5a5d6136bea0899ea822242e8334072319b..1a9723d98844b8eccf7349c20dc44a55695102e1 100644 (file)
--- 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 885e21a595031ac16a030eddb3a6146113ae5a1e..5ecaf0c156799f1a74bd957717917e7be4f41469 100644 (file)
--- 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 c53c6a45739f275ad400a08ed722a722f9c7540d..58f50e5932a5bd6d58c824a276f1bdd6e9fe747d 100644 (file)
--- 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 073e2d609c0b113a59a5930591fefbefc853e8a5..fbcbb1ee64a8b5cfb7f6e9c0cf18a68170306184 100644 (file)
--- 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}