From: Fletcher T. Penney <fletcher@fletcherpenney.net>
Date: Tue, 11 Dec 2018 22:01:49 +0000 (-0500)
Subject: Merge branch 'develop' into feature/rtf
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96c1d96a59713f13da46b6bedcd347a7d2ce45fb;p=multimarkdown

Merge branch 'develop' into feature/rtf
---

96c1d96a59713f13da46b6bedcd347a7d2ce45fb
diff --cc CMakeLists.txt
index d246e27,2aa852e..3aea8b8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -193,9 -195,12 +195,13 @@@ set(src_file
  	Sources/libMultiMarkdown/object_pool.c
  	Sources/libMultiMarkdown/opendocument.c
  	Sources/libMultiMarkdown/opendocument-content.c
+ 	Sources/libMultiMarkdown/opml.c
+ 	Sources/libMultiMarkdown/opml-lexer.c
+ 	Sources/libMultiMarkdown/opml-parser.c
+ 	Sources/libMultiMarkdown/opml-reader.c
  	Sources/libMultiMarkdown/parser.c
  	Sources/libMultiMarkdown/rng.c
 +	Sources/libMultiMarkdown/rtf.c
  	Sources/libMultiMarkdown/scanners.c
  	Sources/libMultiMarkdown/stack.c
  	Sources/libMultiMarkdown/textbundle.c
@@@ -226,7 -236,10 +237,11 @@@ set(header_file
  	Sources/libMultiMarkdown/object_pool.h
  	Sources/libMultiMarkdown/opendocument.h
  	Sources/libMultiMarkdown/opendocument-content.h
 +	Sources/libMultiMarkdown/rtf.h
+ 	Sources/libMultiMarkdown/opml.h
+ 	Sources/libMultiMarkdown/opml-lexer.h
+ 	Sources/libMultiMarkdown/opml-parser.h
+ 	Sources/libMultiMarkdown/opml-reader.h
  	Sources/libMultiMarkdown/scanners.h
  	Sources/libMultiMarkdown/stack.h
  	Sources/libMultiMarkdown/textbundle.c
diff --cc Sources/libMultiMarkdown/include/libMultiMarkdown.h
index 4cf44c1,79d3856..74e97f7
--- a/Sources/libMultiMarkdown/include/libMultiMarkdown.h
+++ b/Sources/libMultiMarkdown/include/libMultiMarkdown.h
@@@ -535,8 -561,9 +561,10 @@@ enum output_format 
  	FORMAT_ODT,
  	FORMAT_TEXTBUNDLE,
  	FORMAT_TEXTBUNDLE_COMPRESSED,
+ 	FORMAT_OPML,
+ 	FORMAT_ITMZ,
  	FORMAT_MMD,
 +	FORMAT_RTF
  };
  
  
diff --cc Sources/libMultiMarkdown/writer.c
index fc22d82,8763557..a97ba15
--- a/Sources/libMultiMarkdown/writer.c
+++ b/Sources/libMultiMarkdown/writer.c
@@@ -69,8 -70,8 +70,9 @@@
  #include "memoir.h"
  #include "mmd.h"
  #include "opendocument-content.h"
+ #include "opml.h"
  #include "parser.h"
 +#include "rtf.h"
  #include "scanners.h"
  #include "token.h"
  #include "uuid.h"
diff --cc Sources/multimarkdown/main.c
index 7eea385,5cdb764..66f5321
--- a/Sources/multimarkdown/main.c
+++ b/Sources/multimarkdown/main.c
@@@ -286,8 -302,10 +302,12 @@@ int main(int argc, char** argv) 
  			format = FORMAT_TEXTBUNDLE;
  		} else if (strcmp(a_format->sval[0], "bundlezip") == 0) {
  			format = FORMAT_TEXTBUNDLE_COMPRESSED;
 +		} else if (strcmp(a_format->sval[0], "rtf") == 0) {
 +			format = FORMAT_RTF;
+ 		} else if (strcmp(a_format->sval[0], "opml") == 0) {
+ 			format = FORMAT_OPML;
+ 		} else if (strcmp(a_format->sval[0], "itmz") == 0) {
+ 			format = FORMAT_ITMZ;
  		} else {
  			// No valid format found
  			fprintf(stderr, "%s: Unknown output format '%s'\n", binname, a_format->sval[0]);