get OPML mostly working

fletcher · Feb 23, 2011 · aeb7a8a · aeb7a8a
1 parent c17bcac
commit aeb7a8a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/markdown_output.c b/markdown_output.c
@@ -1900,7 +1900,7 @@ static void print_opml_element(GString *out, element *elt) {
 		case PLAIN:
 			print_opml_element_list(out,elt->children);
 			if ((elt->next != NULL) && (elt->next->key == PLAIN)) {
-				g_string_append_printf(out, "&#10;&#10;");
+				g_string_append_printf(out, "&#10;");
 			}
 			break;
 	    default: 

diff --git a/markdown_parser.leg b/markdown_parser.leg
@@ -1129,33 +1129,36 @@ MathSpan = '\\' < (
 
 
 DocForOPML = a:StartList b:StartList 
-    ( &{ !extension(EXT_COMPATIBILITY) }
-        &( MetaDataKey Sp ':' Sp (!Newline)) MetaData
-            { a = cons($$, a); b = mk_element(FOOTER);})?
+    ( &( MetaDataKey Sp ':' Sp (!Newline)) MetaData
+            { a = cons($$, a); })?
     ( OPMLBlock { a = cons($$, a); } )*
-    { if (b != NULL) a = cons(b, a);
-        parse_result = reverse(a);
-    }
+    { parse_result = reverse(a); }
 
 OPMLBlock =     BlankLine*
             ( OPMLHeadingSection
-            | Plain )
+            | OPMLPlain )
 
-OPMLHeadingSection = a:StartList Heading { a = cons($$, a); }
+OPMLHeadingSection = a:StartList OPMLHeading { a = cons($$, a); }
     (OPMLSectionBlock {a = cons($$, a); })*
     { $$ = mk_list(HEADINGSECTION, a);}
 
-OPMLSectionBlock =
-            BlankLine*
-            !Heading
-			Plain
-
-OPMLPlain = < Plain >
+OPMLHeading = &(Heading) s:AtxStart Sp? 
+	< (!Newline !(Sp? '#'* Sp Newline) .)* > 
+	(Sp? '#'+)? Sp? Newline
 	{
 		$$ = mk_str(yytext);
-		$$->key = PLAIN;
+		$$->key = s->key;
+		free(s);
 	}
 
+OPMLSectionBlock =
+		BlankLine*
+		!OPMLHeading
+		OPMLPlain
+
+OPMLPlain = a:StartList (!BlankLine Line { a = cons($$,a); })+
+	{ $$ = mk_list(PLAIN, a); }
+
 %%
 
 #include "parsing_functions.c"

diff --git a/parsing_functions.c b/parsing_functions.c
@@ -170,9 +170,6 @@ element * parse_markdown_for_opml(char *string, int extensions) {
 
     char *oldcharbuf;
     syntax_extensions = extensions;
-    references = NULL;
-    notes = NULL;
-    labels = NULL;
 
     oldcharbuf = charbuf;
     charbuf = string;