X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FBase.hs;h=80ecefc78dbcaebbe2a4a13a9377d412b3584aa6;hb=e43bb104a7313dd696b8bb8aa3bafff94706a187;hp=d36b80df34c4250c31ca69e1314b1a704836bab7;hpb=8d43862784caf5fc187c948c89e7ef58551f5642;p=Rakka.git diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs index d36b80d..80ecefc 100644 --- a/Rakka/Wiki/Interpreter/Base.hs +++ b/Rakka/Wiki/Interpreter/Base.hs @@ -41,7 +41,8 @@ divInterp :: Interpreter divInterp = BlockCommandInterpreter { bciName = "div" , bciInterpret - = \ _ (BlockCommand _ attrs contents) -> return $ Div attrs contents + = \ _ (BlockCommand _ attrs contents) + -> return $ Div attrs (map Block contents) } @@ -66,7 +67,7 @@ otherLangsInterp Just linkTable -> do Languages langTable <- getSysConf (ctxSysConf ctx) let merged = mergeTables langTable (M.toList linkTable) - return $ List $ mkLangList merged + return $ mkLangList merged } where mergeTables :: Map LanguageTag LanguageName @@ -78,9 +79,9 @@ otherLangsInterp in (langName, pageName) : mergeTables m xs - mkLangList :: [(LanguageName, PageName)] -> ListElement - mkLangList xs = ListElement Bullet (map mkLangLink xs) + mkLangList :: [(LanguageName, PageName)] -> BlockElement + mkLangList xs = List Bullet (map mkLangLink xs) mkLangLink :: (LanguageName, PageName) -> ListItem mkLangLink (langName, pageName) - = [Right (PageLink (Just pageName) Nothing (Just langName))] \ No newline at end of file + = [Inline (PageLink (Just pageName) Nothing (Just langName))] \ No newline at end of file