authoring 0.3.2 → 0.3.3

raw patch · 2 files changed

+14/−5 lines, 2 filesdep +haskell-src-meta

Dependencies added: haskell-src-meta

Files

• authoring.cabal +2/−1
• src/Text/Authoring/TH.hs +12/−4

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                authoring-version:             0.3.2+version:             0.3.3 synopsis:            A library for writing papers description:         This package is a combinator library for writing papers. homepage:            http://github.com/nushio3/authoring@@ -42,6 +42,7 @@     , citation-resolve >= 0.4.2     , containers >= 0.5     , data-default+    , haskell-src-meta >= 0.6.0.4     , HaTeX >= 3.8     , lens     , mtl

@@ -34,12 +34,14 @@ import Data.Typeable (Typeable) import Data.Monoid import qualified Data.Text as T+import qualified Language.Haskell.Meta.Parse.Careful as Meta import Language.Haskell.TH import Language.Haskell.TH.Quote import Text.Trifecta import Text.Trifecta.Delta import Text.Parser.LookAhead import Text.PrettyPrint.ANSI.Leijen as Pretty hiding (line, (<>), (<$>), empty, string)+import Text.Printf import Safe (readMay) import System.IO @@ -77,11 +79,17 @@  cvtE :: QQConfig -> Component -> ExpQ cvtE cfg (StrPart x)    = escaper cfg $ appE (varE 'T.pack) $ stringE x-cvtE cfg (EmbedShow x)  = escaper cfg $ appE (varE 'T.pack) $ appE (varE 'showJoin) (chainAppE x)-cvtE _   (EmbedMonad x) = chainAppE x+cvtE cfg (EmbedShow x)  = +  either (fallback "#" x) +         (escaper cfg . appE [| T.pack . showJoin |] . return) $+  Meta.parseExp x+cvtE _   (EmbedMonad x) =  +  either (fallback "@" x) return $+  Meta.parseExp x -chainAppE :: String -> ExpQ-chainAppE str = foldr1 appE $ map (varE . mkName) $ words str+fallback :: String -> String -> String -> ExpQ+fallback sym str _ = [| esc . T.pack |] `appE` +                   (stringE $ printf "%s{%s}" sym str)  trim :: String -> String trim = T.unpack . T.strip . T.pack