X-Git-Url: http://gitweb.michael.orlitzky.com/?p=dead%2Flwn-epub.git;a=blobdiff_plain;f=src%2FLWN%2FArticlePage.hs;h=5964013f418303db52ce1ebe7dfdea123cdfe70c;hp=927e241d91eba76b57f586133087db652738df4f;hb=6103dbc5f8d3689e32001c3fd7627f3153e40bb0;hpb=5cb0170a5ab418147e3403fb141797f2282b78f4 diff --git a/src/LWN/ArticlePage.hs b/src/LWN/ArticlePage.hs index 927e241..5964013 100644 --- a/src/LWN/ArticlePage.hs +++ b/src/LWN/ArticlePage.hs @@ -29,16 +29,16 @@ instance XHTML ArticlePage where "" ++ "" ++ - "\n\n" ++ + "" ++ " " ++ - " " ++ (LWN.Article.title a) ++ "\n" ++ - "\n" ++ - "\n" ++ - "
\n\n" ++ + " " ++ (show $ LWN.Article.title a) ++ "" ++ + "" ++ + "" ++ + "
" ++ (to_xhtml a) ++ - "\n\n
\n" ++ - "\n\n" ++ + "
" ++ + "" ++ "" @@ -49,7 +49,7 @@ instance Epublishable ArticlePage where Just [x] -> return $ Just $ ArticlePage x _ -> return Nothing - title (ArticlePage x) = LWN.Article.title x + title (ArticlePage x) = show $ LWN.Article.title x -- | Takes data from an LWN page and determines whether or not it's a @@ -95,7 +95,7 @@ parse_articles xml = do parsed_headline <- parse_headline xml parsed_byline <- parse_byline xml parsed_body <- parse_body xml - let title' = fromJust parsed_headline - let byline' = fromJust parsed_byline - let body' = fromJust parsed_body + let title' = Title (fromJust parsed_headline) + let byline' = Byline parsed_byline + let body' = BodyHtml (fromJust parsed_body) return $ Just $ [Article title' byline' body']