From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Sun, 2 Jul 2017 13:00:30 +0000 (-0400)
Subject: FIXED: Fix asset path for CSS metadata
X-Git-Tag: 6.1.0^2~14^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88bd242fa417cc379fb9def10abf79a4669a7b77;p=multimarkdown

FIXED: Fix asset path for CSS metadata
---

diff --git a/Sources/libMultiMarkdown/html.c b/Sources/libMultiMarkdown/html.c
index 8a90a2f..87a3b4c 100644
--- a/Sources/libMultiMarkdown/html.c
+++ b/Sources/libMultiMarkdown/html.c
@@ -1848,6 +1848,7 @@ void mmd_start_complete_html(DString * out, const char * source, scratch_pad * s
 				store_asset(scratch, m->value);
 				asset * a = extract_asset(scratch, m->value);
 
+				mmd_print_string_html(out, "assets/", false);
 				mmd_print_string_html(out, a->asset_path, false);
 			} else {
 				mmd_print_string_html(out, m->value, false);
diff --git a/Sources/libMultiMarkdown/textbundle.c b/Sources/libMultiMarkdown/textbundle.c
index b89d5b2..0874f3d 100644
--- a/Sources/libMultiMarkdown/textbundle.c
+++ b/Sources/libMultiMarkdown/textbundle.c
@@ -306,9 +306,9 @@ DString * textbundle_create(const char * body, mmd_engine * e, const char * dire
 		fprintf(stderr, "Error adding assets directory to zip.\n");
 	}
 
-	// Add html version document
-	len = strlen(body);
-	status = mz_zip_writer_add_mem(&zip, "text.html", body, len, MZ_BEST_COMPRESSION);
+	// Add main document
+	len = e->dstr->currentStringLength;
+	status = mz_zip_writer_add_mem(&zip, "text.md", e->dstr->str, len, MZ_BEST_COMPRESSION);
 	if (!status) {
 		fprintf(stderr, "Error adding content to zip.\n");
 	}
diff --git a/Sources/libMultiMarkdown/writer.c b/Sources/libMultiMarkdown/writer.c
index 9bb8908..f0e877d 100644
--- a/Sources/libMultiMarkdown/writer.c
+++ b/Sources/libMultiMarkdown/writer.c
@@ -1732,9 +1732,10 @@ void mmd_engine_export_token_tree(DString * out, mmd_engine * e, short format) {
 			break;
 		case FORMAT_EPUB:
 		case FORMAT_TEXTBUNDLE_COMPRESSED:
-			mmd_start_complete_html(out, e->dstr->str, scratch);
 			scratch->store_assets = true;
 
+			mmd_start_complete_html(out, e->dstr->str, scratch);
+
 			mmd_export_token_tree_html(out, e->dstr->str, e->root, scratch);
 			mmd_export_footnote_list_html(out, e->dstr->str, scratch);
 			mmd_export_glossary_list_html(out, e->dstr->str, scratch);