Browse Source

Resolved merge problems with metadata section in Core

Getty Ritter 7 years ago
parent
commit
4a11d3df77

+ 1 - 1
ptolemy-bridge/ptolemy-bridge.cabal

@@ -9,7 +9,7 @@ maintainer:       gettyritter@gmail.com
 copyright:        ©2016 Getty Ritter
 category: Text
 build-type:       Simple
-cabal-version:    >= 1.2
+cabal-version:    >= 1.12
 
 library
   exposed-modules:     Text.Ptolemy.Pandoc

+ 15 - 1
ptolemy-core/Text/Ptolemy/Core.hs

@@ -1,8 +1,22 @@
 module Text.Ptolemy.Core where
 
 import           Data.Text (Text)
+import           Data.Map.Strict (Map)
 import           Data.Vector (Vector)
-import qualified Data.Vector as V
+
+type Reader = Text -> Either String Ptolemy
+type Writer = Ptolemy -> Text
+
+data Ptolemy = Ptolemy
+  { meta     :: Maybe Meta
+  , document :: Document
+  } deriving (Eq, Show, Read, Ord)
+
+data Meta = Meta { fromMeta :: Map Text MetaValue }
+  deriving (Eq, Show, Read, Ord)
+
+data MetaValue = MetaValue
+  deriving (Eq, Show, Read, Ord)
 
 type Document = Vector Block
 type DocumentList = Vector Document

+ 2 - 1
ptolemy-core/ptolemy-core.cabal

@@ -9,12 +9,13 @@ maintainer:       gettyritter@gmail.com
 copyright:        ©2016 Getty Ritter
 category:         Text
 build-type:       Simple
-cabal-version:    >= 1.2
+cabal-version:    >= 1.12
 
 library
   exposed-modules:     Text.Ptolemy.Core
   ghc-options:         -Wall
   build-depends:       base >=4.7 && <4.9,
+                       containers,
                        vector,
                        text
   default-language:    Haskell2010