Wrote many...

[Rakka.git] / Rakka / Wiki / Interpreter / Base.hs

diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index f2fd602fe791e9c02e4bad41a09ea08509b97178..80ecefc78dbcaebbe2a4a13a9377d412b3584aa6 100644 (file)
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -1,24 +1,24 @@
 module Rakka.Wiki.Interpreter.Base
-    ( baseInterpreters
+    ( interpreters
     )
     where
 
+import           Data.Map (Map)
+import qualified Data.Map as M
+import           Data.Maybe
+import           Rakka.Page
+import           Rakka.SystemConfig
 import           Rakka.Wiki
 import           Rakka.Wiki.Interpreter
-import           Rakka.Wiki.Interpreter.Base.Image
-import           Rakka.Wiki.Interpreter.Base.Outline
 
 
-baseInterpreters :: [Interpreter]
-baseInterpreters = [ lineBreakInterp
-                   , spanInterp
-                   , divInterp
-                   , imageInterp
-                   , imgFrameInterp
-
-                   , pageNameInterp
-                   , outlineInterp
-                   ]
+interpreters :: [Interpreter]
+interpreters = [ lineBreakInterp
+               , spanInterp
+               , divInterp
+               , pageNameInterp
+               , otherLangsInterp
+               ]
 
 
 lineBreakInterp :: Interpreter
@@ -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)
             }
 
 
@@ -51,3 +52,36 @@ pageNameInterp = InlineCommandInterpreter {
                  , iciInterpret
                      = \ ctx _ -> return $ Text (ctxPageName ctx)
                  }
+
+
+otherLangsInterp :: Interpreter
+otherLangsInterp
+    = BlockCommandInterpreter {
+        bciName      = "inOtherLanguages"
+      , bciInterpret
+          = \ ctx _ ->
+            case fmap pageOtherLang (ctxMainPage ctx) of
+              Nothing
+                -> return EmptyBlock
+
+              Just linkTable
+                  -> do Languages langTable <- getSysConf (ctxSysConf ctx)
+                        let merged = mergeTables langTable (M.toList linkTable)
+                        return $ mkLangList merged
+      }
+    where
+      mergeTables :: Map LanguageTag LanguageName
+                  -> [(LanguageTag, PageName)]
+                  -> [(LanguageName, PageName)]
+      mergeTables _ []     = []
+      mergeTables m (x:xs) = let (langTag, pageName) = x
+                                 langName            = fromMaybe langTag (M.lookup langTag m)
+                             in
+                               (langName, pageName) : mergeTables m xs
+
+      mkLangList :: [(LanguageName, PageName)] -> BlockElement
+      mkLangList xs = List Bullet (map mkLangLink xs)
+
+      mkLangLink :: (LanguageName, PageName) -> ListItem
+      mkLangLink (langName, pageName)
+          = [Inline (PageLink (Just pageName) Nothing (Just langName))]
\ No newline at end of file