diff options
| author | Yan Pashkovsky <Yanpas@users.noreply.github.com> | 2018-05-09 19:48:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-09 19:48:34 +0300 |
| commit | a337685fe0ab9c63b9456f27787bbe4f0d785a94 (patch) | |
| tree | e9fc4dfc0802f8acd97f06a8cc8d7c89b5a988ab /src/Text/Pandoc/Translations.hs | |
| parent | 8e9973b9f761262b6871206f741ac3f2a25aa6bb (diff) | |
| parent | 5f33d2e0cd9f19566904c93be04f586de811dd75 (diff) | |
| download | pandoc-a337685fe0ab9c63b9456f27787bbe4f0d785a94.tar.gz | |
Merge branch 'master' into groff_reader
Diffstat (limited to 'src/Text/Pandoc/Translations.hs')
| -rw-r--r-- | src/Text/Pandoc/Translations.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Translations.hs b/src/Text/Pandoc/Translations.hs index 949618178..4a216af92 100644 --- a/src/Text/Pandoc/Translations.hs +++ b/src/Text/Pandoc/Translations.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} +{-# LANGUAGE CPP #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {- @@ -45,6 +47,7 @@ module Text.Pandoc.Translations ( , readTranslations ) where +import Prelude import Data.Aeson.Types (typeMismatch) import qualified Data.HashMap.Strict as HM import qualified Data.Map as M @@ -80,7 +83,7 @@ data Term = deriving (Show, Eq, Ord, Generic, Enum, Read) newtype Translations = Translations (M.Map Term String) - deriving (Show, Generic, Monoid) + deriving (Show, Generic, Semigroup, Monoid) instance FromJSON Term where parseJSON (String t) = case safeRead (T.unpack t) of |