From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Mon, 20 Mar 2017 01:58:17 +0000 (-0400)
Subject: CHANGED: Refactor enumerations
X-Git-Tag: 6.0.0-rc3^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c95f1cf3626e1c0e5c859a5ec31b34d770343290;p=multimarkdown

CHANGED: Refactor enumerations
---

diff --git a/Sources/libMultiMarkdown/include/libMultiMarkdown.h b/Sources/libMultiMarkdown/include/libMultiMarkdown.h
index 7c93e6f..c712018 100644
--- 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 86317ec..53f0f5d 100644
--- 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);