Merge branch 'develop' into feature/rtf

diff --cc CMakeLists.txt
index d246e27fa4496dca1ab99812a00aa3fdf1e0d1d0,2aa852e89f41f6315890e1ff8c53d35dcd1f76a0..3aea8b8f94ca7abe271f3fb89a34c3523bc37431
--- 1/CMakeLists.txt
--- 2/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 4cf44c1295b111ec997747f9c8930c106dd9a59d,79d38568a45d6e9dc3d98fe03dbb225c3fea3f58..74e97f7e936e243d4365cf58f4c60912e5342281
--- 1/Sources/libMultiMarkdown/include/libMultiMarkdown.h
--- 2/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 fc22d82090da41ed73436b43e32218b3c8093076,8763557faf2564e27358235c1827d16d5acbe083..a97ba155fa33b59ecccbed65bde360ea9c700a9a
--- 1/Sources/libMultiMarkdown/writer.c
--- 2/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 7eea3855106befe1b3e60ab3c8c877502e2f4688,5cdb764304ddc21f8155408f3869052754aede18..66f5321ad96412f97cec3e9d40e28ff44c53f88c
--- 1/Sources/multimarkdown/main.c
--- 2/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]);