X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FBase.hs;h=73950537c9bd7179b26655f0f38531df69201de4;hb=42f51754dea02201aececaacbf194d714cd58aaf;hp=2f6aade45ac6ba8a86f88d2daa12cb02841ed29e;hpb=5ab256be8bbbb1f4a012b41ac1cc3f9b29aa7d57;p=Rakka.git

diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index 2f6aade..7395053 100644
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -1,19 +1,31 @@
+{-# LANGUAGE
+    OverloadedStrings
+  , RecordWildCards
+  , UnicodeSyntax
+  #-}
 module Rakka.Wiki.Interpreter.Base
     ( interpreters
     )
     where
-
-import           Data.Map (Map)
+import Control.Applicative
+import Control.Arrow
+import Control.Arrow.ListArrow
+import Control.Arrow.Unicode
+import qualified Data.CaseInsensitive as CI
+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           Text.XML.HXT.Arrow
-
-
-interpreters :: [Interpreter]
+import Data.Maybe
+import Data.Monoid.Unicode
+import qualified Data.Text as T
+import Prelude.Unicode
+import Rakka.Page
+import Rakka.SystemConfig
+import Rakka.Wiki
+import Rakka.Wiki.Interpreter
+import Text.XML.HXT.Arrow.XmlArrow
+import Text.XML.HXT.XPath
+
+interpreters ∷ [Interpreter]
 interpreters = [ lineBreakInterp
                , spanInterp
                , divInterp
@@ -26,7 +38,6 @@ interpreters = [ lineBreakInterp
                , configurationInterp
                ]
 
-
 lineBreakInterp :: Interpreter
 lineBreakInterp = InlineCommandInterpreter {
                     iciName = "br"
@@ -59,43 +70,44 @@ pageNameInterp = InlineCommandInterpreter {
                      = \ ctx _ -> return $ Text (fromMaybe "" $ ctxPageName ctx)
                  }
 
-
-otherLangsInterp :: Interpreter
+otherLangsInterp ∷ Interpreter
 otherLangsInterp
     = BlockCommandInterpreter {
         bciName = "inOtherLanguages"
       , bciInterpret
-          = \ ctx _ ->
-            let linkTable = case ctxMainPage ctx of
-                              Just page -> runLA ( getXPathTreesInDoc "/page/otherLang/link"
-                                                   >>>
-                                                   ( getAttrValue0 "lang"
-                                                     &&&
-                                                     getAttrValue0 "page"
-                                                   )
-                                                 ) page
-                              Nothing   -> []
+          = \(InterpreterContext {..}) _ →
+            let linkTable = case ctxMainPage of
+                              Just page → runLA ( getXPathTreesInDoc "/page/otherLang/link"
+                                                  ⋙
+                                                  ( getAttrValue0 "lang"
+                                                    &&&
+                                                    getAttrValue0 "page"
+                                                  )
+                                                ) page
+                              Nothing   → []
             in
               case linkTable of
                 [] -> return EmptyBlock
-                _  -> do Languages langTable <- getSysConf (ctxSysConf ctx)
-                         let merged = mergeTables langTable linkTable
-                         return $ mkLangList merged
+                _  -> do Languages langTable ← getSysConf ctxSysConf
+                         let merged = mergeTables langTable $
+                                      (CI.mk ∘ T.pack ⁂ T.pack) <$> linkTable
+                         pure $ mkLangList merged
       }
     where
-      mergeTables :: Map LanguageTag LanguageName
-                  -> [(LanguageTag, PageName)]
-                  -> [(LanguageName, PageName)]
+      mergeTables ∷ Map LanguageTag LanguageName
+                  → [(LanguageTag, PageName)]
+                  → [(LanguageName, PageName)]
       mergeTables _ []     = []
       mergeTables m (x:xs) = let (langTag, name) = x
-                                 langName        = fromMaybe langTag (M.lookup langTag m)
+                                 langName        = fromMaybe (CI.foldedCase langTag)
+                                                             (M.lookup langTag m)
                              in
                                (langName, name) : mergeTables m xs
 
-      mkLangList :: [(LanguageName, PageName)] -> BlockElement
-      mkLangList xs = List Bullet (map mkLangLink xs)
+      mkLangList ∷ [(LanguageName, PageName)] → BlockElement
+      mkLangList = List Bullet ∘ (mkLangLink <$>)
 
-      mkLangLink :: (LanguageName, PageName) -> ListItem
+      mkLangLink ∷ (LanguageName, PageName) → ListItem
       mkLangLink (langName, name)
           = [Inline (PageLink (Just name) Nothing (Just langName))]
 
@@ -103,7 +115,7 @@ otherLangsInterp
 -- <input type="button"
 --        value="Create new page"
 --        onclick="Rakka.newPage()"
---        class="newButton" />
+--        class="newButton controls" />
 newPageInterp :: Interpreter
 newPageInterp 
     = InlineCommandInterpreter {
@@ -114,7 +126,7 @@ newPageInterp
                 attrs = [ ("type"   , "button")
                         , ("value"  , label)
                         , ("onclick", "Rakka.newPage()")
-                        , ("class"  , "newButton")
+                        , ("class"  , "newButton controls")
                         ]
             in
               return (Input attrs)
@@ -124,19 +136,19 @@ newPageInterp
 -- <input type="button"
 --        value="Edit"
 --        onclick="Rakka.editPage(\"Foo\")"
---        class="editButton" />
-editPageInterp :: Interpreter
+--        class="editButton controls" />
+editPageInterp ∷ Interpreter
 editPageInterp 
     = InlineCommandInterpreter {
         iciName = "editPage"
       , iciInterpret
-          = \ ctx (InlineCommand _ args _) ->
+          = \ctx (InlineCommand _ args _) →
             let name  = fromMaybe (fromMaybe "" $ ctxPageName ctx) (lookup "page" args)
                 label = fromMaybe "Edit this page" (lookup "label" args)
                 attrs = [ ("type"   , "button")
                         , ("value"  , label)
-                        , ("onclick", "Rakka.editPage(\"" ++ name ++ "\")")
-                        , ("class"  , "editButton")
+                        , ("onclick", "Rakka.editPage(\"" ⊕ name ⊕ "\")")
+                        , ("class"  , "editButton controls")
                         ]
             in
               return (Input attrs)
@@ -145,7 +157,7 @@ editPageInterp
 
 -- <input type="button"
 --        value="Login"
---        class="loginButton" />
+--        class="loginButton controls" />
 loginInterp :: Interpreter
 loginInterp 
     = InlineCommandInterpreter {
@@ -154,7 +166,7 @@ loginInterp
           = \ _ _ ->
             let attrs = [ ("type" , "button")
                         , ("value", "Login")
-                        , ("class", "loginButton")
+                        , ("class", "loginButton controls")
                         ]
             in
               return (Input attrs)
@@ -178,16 +190,16 @@ searchFieldInterp
 
 -- <input type="button"
 --        value="Configuration"
---        class="configButton" />
-configurationInterp :: Interpreter
+--        class="configButton controls" />
+configurationInterp ∷ Interpreter
 configurationInterp 
     = InlineCommandInterpreter {
         iciName = "configuration"
       , iciInterpret
-          = \ _ _ ->
+          = \_ _ →
             let attrs = [ ("type" , "button")
                         , ("value", "Configuration")
-                        , ("class", "configButton")
+                        , ("class", "configButton controls")
                         ]
             in
               return (Input attrs)