X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=Rakka.git;a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FOutline.hs;h=eb8c9d4db095b3b1d2e8e14edcabf9a65b7c8664;hp=04554a69b85b09dbe5a1f4a10974d162d871aa70;hb=e43bb104a7313dd696b8bb8aa3bafff94706a187;hpb=126e9f3faff19add1fb3dea792ec10dc57c30f03

diff --git a/Rakka/Wiki/Interpreter/Outline.hs b/Rakka/Wiki/Interpreter/Outline.hs
index 04554a6..eb8c9d4 100644
--- a/Rakka/Wiki/Interpreter/Outline.hs
+++ b/Rakka/Wiki/Interpreter/Outline.hs
@@ -18,12 +18,12 @@ outlineInterp = BlockCommandInterpreter {
                 , bciInterpret
                     = \ ctx _ ->
                       case ctxMainTree ctx of
-                        Just tree -> return $ Div [("class", "outline")] [List $ mkOutline tree]
+                        Just tree -> return $ Div [("class", "outline")] [Block $ mkOutline tree]
                         Nothing   -> return EmptyBlock
                 }
 
 
-mkOutline :: WikiPage -> ListElement
+mkOutline :: WikiPage -> BlockElement
 mkOutline tree
     = let headings = listify query tree
       in
@@ -36,11 +36,11 @@ query = mkQ False $ \ x -> case x of
                              _           -> False
 
 
-emptyOutline :: ListElement
-emptyOutline = ListElement Bullet []
+emptyOutline :: BlockElement
+emptyOutline = List Bullet []
 
                                    
-mkOutline' :: ListElement -> Int -> [BlockElement] -> (ListElement, [BlockElement])
+mkOutline' :: BlockElement -> Int -> [BlockElement] -> (BlockElement, [BlockElement])
 mkOutline' soFar _     []     = (soFar, [])
 mkOutline' soFar level (x:xs)
     = case x of
@@ -53,7 +53,7 @@ mkOutline' soFar level (x:xs)
                               , linkFragment = Just text
                               , linkText     = Just text
                               }
-                       item = [Right link]
+                       item = [Inline link]
                    in
                      mkOutline' (soFar { listItems = listItems soFar ++ [item] }) n xs
 
@@ -72,8 +72,8 @@ mkOutline' soFar level (x:xs)
 
                        lastItem' :: ListItem
                        lastItem' = case lastItem of
-                                     []   -> [Left nested]
-                                     i:[] -> i ++ [Left nested]
+                                     []   -> [Block nested]
+                                     i:[] -> i ++ [Block nested]
 
                        soFar' = soFar { listItems = nonLastItems ++ [lastItem'] }
                    in