CHANGED: Refactor enumerations

diff --git a/Sources/libMultiMarkdown/include/libMultiMarkdown.h b/Sources/libMultiMarkdown/include/libMultiMarkdown.h
index 7c93e6f96d5f48f856d4188cfa83c9a663dd5d8d..c712018bb4cefe35d1e6d7c1c16939e6a0345f4b 100644 (file)
--- a/Sources/libMultiMarkdown/include/libMultiMarkdown.h
+++ b/Sources/libMultiMarkdown/include/libMultiMarkdown.h
@@ -321,13 +321,13 @@ enum smart_quotes_language {
 
 
 enum output_format {
-       FORMAT_MMD,
-       FORMAT_BEAMER,
        FORMAT_HTML,
+       FORMAT_EPUB,
        FORMAT_LATEX,
+       FORMAT_BEAMER,
        FORMAT_MEMOIR,
        FORMAT_ODF,
-       FORMAT_EPUB,
+       FORMAT_MMD,
 };
 
 

diff --git a/Sources/libMultiMarkdown/transclude.c b/Sources/libMultiMarkdown/transclude.c
index 86317ec77a39f7a6be276d0ed5102113e075c933..53f0f5ddd9e58211fe4627853d6612eae2f1d289 100644 (file)
--- a/Sources/libMultiMarkdown/transclude.c
+++ b/Sources/libMultiMarkdown/transclude.c
@@ -358,7 +358,7 @@ void transclude_source(DString * source, const char * dir, short format, stack *
 
                        // Adjust file wildcard extension for output format
                        // e.g. `foo.*`
-                       if (format && strncmp(&text[stop - start - 4], ".*", 2) == 0) {
+                       if ((format != FORMAT_MMD) && strncmp(&text[stop - start - 4], ".*", 2) == 0) {
                                // Trim '.*'
                                d_string_erase(file_path, file_path->currentStringLength - 2, 2);