hoodle-builder 0.1.1 → 0.2
raw patch · 3 files changed
+267/−10 lines, 3 filesdep +double-conversiondep ~hoodle-typesPVP ok
version bump matches the API change (PVP)
Dependencies added: double-conversion
Dependency ranges changed: hoodle-types
API changes (from Hackage documentation)
- Text.Hoodle.Builder: toFixed :: Int -> Double -> ByteString
+ Text.Hoodle.Builder: buildEmbeddedPdf :: ByteString -> Builder
+ Text.Hoodle.Builder: buildLink :: Link -> Builder
+ Text.Hoodle.Builder.V0_1_1: (<>) :: Monoid a => a -> a -> a
+ Text.Hoodle.Builder.V0_1_1: build2D :: Pair Double Double -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildBackground :: Background -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildHoodle :: Hoodle -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildImage :: Image -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildItem :: Item -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildLayer :: Layer -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildPage :: Page -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildSVG :: SVG -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildStroke :: Stroke -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildTitle :: ByteString -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildXYFrm3D :: (Double, Double, Double) -> Builder
+ Text.Hoodle.Builder.V0_1_1: buildZFrm3D :: (Double, Double, Double) -> Builder
+ Text.Hoodle.Builder.V0_1_1: builder :: Hoodle -> ByteString
Files
- hoodle-builder.cabal +6/−3
- src/Text/Hoodle/Builder.hs +74/−7
- src/Text/Hoodle/Builder/V0_1_1.hs +187/−0
hoodle-builder.cabal view
@@ -1,5 +1,5 @@ Name: hoodle-builder-Version: 0.1.1+Version: 0.2 Synopsis: text builder for hoodle file format Description: This library builds text xoj format file from hoodle data structure License: BSD3@@ -20,14 +20,17 @@ ghc-prof-options: -caf-all -auto-all Build-Depends: base == 4.*,- hoodle-types >= 0.1.1,+ hoodle-types >= 0.2, lens >= 2.5, blaze-builder == 0.3.*, strict == 0.3.*, - bytestring >= 0.9+ bytestring >= 0.9, + double-conversion >= 0.2.0.6 Exposed-Modules: Text.Hoodle.Builder+ Text.Hoodle.Builder.V0_1_1+ -- Text.Hoodle.Builder.V0_1_999 Other-Modules:
src/Text/Hoodle/Builder.hs view
@@ -17,11 +17,11 @@ -- from other packages import Control.Lens import qualified Data.ByteString as S-import qualified Data.ByteString.Char8 as SC+-- import qualified Data.ByteString.Char8 as SC import qualified Data.ByteString.Lazy as L import Blaze.ByteString.Builder import Blaze.ByteString.Builder.Char8 (fromChar, fromString)--- import Data.Double.Conversion.ByteString +import Data.Double.Conversion.ByteString #if MIN_VERSION_base(4,5,0) import Data.Monoid hiding ((<>)) #else@@ -38,10 +38,12 @@ (<>) = mappend -- | -toFixed :: Int -> Double -> S.ByteString-toFixed 2 x = SC.pack . show . (*0.01) . fromIntegral . floor - $ x*100+{- toFixed :: Int -> Double -> S.ByteString+toFixed 2 x = printf "%.2f" x+ -- SC.pack . show . (*0.01) . fromIntegral . floor + -- $ x*100 toFixed _ _ = error "undefined toFixed"+-} -- | builder :: Hoodle -> L.ByteString@@ -49,8 +51,11 @@ -- | buildHoodle :: Hoodle -> Builder -buildHoodle hdl = fromByteString "<?xml version=\"1.0\" standalone=\"no\"?>\n<hoodle version=\"0.1.1\">\n"+buildHoodle hdl = fromByteString "<?xml version=\"1.0\" standalone=\"no\"?>\n<hoodle version=\"0.2\" id=\""+ <> fromByteString (view hoodleID hdl) + <> fromByteString "\">\n" <> (buildTitle . view title) hdl + <> (maybe mempty buildEmbeddedPdf . view embeddedPdf) hdl <> (mconcat . map buildPage . view pages) hdl <> fromByteString "</hoodle>\n" @@ -61,6 +66,12 @@ <> fromByteString "</title>\n" -- | +buildEmbeddedPdf :: S.ByteString -> Builder +buildEmbeddedPdf pdf = fromByteString "<embeddedpdf src=\""+ <> fromByteString pdf+ <> fromByteString "\"/>\n"++-- | buildPage :: Page -> Builder buildPage pg = fromByteString "<page width=\"" <> fromByteString (toFixed 2 w)@@ -98,6 +109,13 @@ <> fromByteString "\" pageno=\"" <> fromString (show pageno) <> fromByteString "\"/>\n"+ BackgroundEmbedPdf typ pageno -> + fromByteString "<background type=\""+ <> fromByteString typ + <> fromByteString "\" pageno=\""+ <> fromString (show pageno)+ <> fromByteString "\"/>\n"+ -- | buildLayer :: Layer -> Builder@@ -109,7 +127,9 @@ buildItem (ItemStroke strk) = buildStroke strk buildItem (ItemImage img) = buildImage img buildItem (ItemSVG svg) = buildSVG svg +buildItem (ItemLink lnk) = buildLink lnk + -- | buildStroke :: Stroke -> Builder buildStroke stroke@(Stroke _ _ _ _) = @@ -163,7 +183,54 @@ <> fromByteString "<render><![CDATA[" <> fromByteString rdr <> fromByteString "]]></render>"- <> fromByteString "</svgobject>"+ <> fromByteString "</svgobject>\n"++buildLink :: Link -> Builder +buildLink (Link i typ loc mtxt mcmd rdr (x,y) (Dim w h)) =+ fromByteString "<link id=\"" + <> fromByteString i + <> fromByteString "\" type=\"" + <> fromByteString typ+ <> fromByteString "\" location=\""+ <> fromByteString loc+ <> fromByteString "\" x=\"" + <> fromByteString (toFixed 2 x)+ <> fromByteString "\" y=\""+ <> fromByteString (toFixed 2 y)+ <> fromByteString "\" width=\""+ <> fromByteString (toFixed 2 w)+ <> fromByteString "\" height=\""+ <> fromByteString (toFixed 2 h)+ <> fromByteString "\" >\n"+ <> maybe mempty (\txt->fromByteString "<text><![CDATA[" <> fromByteString txt <> fromByteString "]]></text>") mtxt + <> maybe mempty (\cmd->fromByteString "<command><![CDATA[" <> fromByteString cmd <> fromByteString "]]></command>") mcmd + <> fromByteString "<render><![CDATA[" + <> fromByteString rdr + <> fromByteString "]]></render>"+ <> fromByteString "</link>\n"+buildLink (LinkDocID i docid loc mtxt mcmd rdr (x,y) (Dim w h)) =+ fromByteString "<link id=\"" + <> fromByteString i + <> fromByteString "\" type=\"linkdocid\" linkedid=\"" + <> fromByteString docid + <> fromByteString "\" location=\""+ <> fromByteString loc+ <> fromByteString "\" x=\"" + <> fromByteString (toFixed 2 x)+ <> fromByteString "\" y=\""+ <> fromByteString (toFixed 2 y)+ <> fromByteString "\" width=\""+ <> fromByteString (toFixed 2 w)+ <> fromByteString "\" height=\""+ <> fromByteString (toFixed 2 h)+ <> fromByteString "\" >\n"+ <> maybe mempty (\txt->fromByteString "<text><![CDATA[" <> fromByteString txt <> fromByteString "]]></text>") mtxt + <> maybe mempty (\cmd->fromByteString "<command><![CDATA[" <> fromByteString cmd <> fromByteString "]]></command>") mcmd + <> fromByteString "<render><![CDATA[" + <> fromByteString rdr + <> fromByteString "]]></render>"+ <> fromByteString "</link>\n" + -- | build2D :: Pair Double Double -> Builder
+ src/Text/Hoodle/Builder/V0_1_1.hs view
@@ -0,0 +1,187 @@+{-# LANGUAGE CPP, OverloadedStrings #-}++-----------------------------------------------------------------------------+-- |+-- Module : Text.Hoodle.Builder.V0_1_1+-- Copyright : (c) 2011-2013 Ian-Woo Kim+--+-- License : BSD3+-- Maintainer : Ian-Woo Kim <ianwookim@gmail.com>+-- Stability : experimental+-- Portability : GHC+--+-----------------------------------------------------------------------------++module Text.Hoodle.Builder.V0_1_1 where++-- from other packages +import Control.Lens +import qualified Data.ByteString as S+-- import qualified Data.ByteString.Char8 as SC+import qualified Data.ByteString.Lazy as L+import Blaze.ByteString.Builder+import Blaze.ByteString.Builder.Char8 (fromChar, fromString)+import Data.Double.Conversion.ByteString +#if MIN_VERSION_base(4,5,0) +import Data.Monoid hiding ((<>)) +#else+import Data.Monoid +#endif +import Data.Strict.Tuple+-- from this package +import Data.Hoodle.Simple.V0_1_1++infixl 4 <>++-- | +(<>) :: Monoid a => a -> a -> a +(<>) = mappend ++-- | +{- toFixed :: Int -> Double -> S.ByteString+toFixed 2 x = printf "%.2f" x+ -- SC.pack . show . (*0.01) . fromIntegral . floor + -- $ x*100+toFixed _ _ = error "undefined toFixed"+-}++-- | +builder :: Hoodle -> L.ByteString+builder = toLazyByteString . buildHoodle++-- |+buildHoodle :: Hoodle -> Builder +buildHoodle hdl = fromByteString "<?xml version=\"1.0\" standalone=\"no\"?>\n<hoodle version=\"0.1.1\">\n"+ <> (buildTitle . view title) hdl + <> (mconcat . map buildPage . view pages) hdl+ <> fromByteString "</hoodle>\n"+ +-- | +buildTitle :: S.ByteString -> Builder+buildTitle ttl = fromByteString "<title>"+ <> fromByteString ttl+ <> fromByteString "</title>\n"++-- | +buildPage :: Page -> Builder +buildPage pg = fromByteString "<page width=\""+ <> fromByteString (toFixed 2 w)+ <> fromByteString "\" height=\""+ <> fromByteString (toFixed 2 h)+ <> fromByteString "\">\n" + <> (buildBackground . view background) pg + <> (mconcat . map buildLayer . view layers) pg + <> fromByteString "</page>\n"+ where Dim w h = view dimension pg+ +-- | +buildBackground :: Background -> Builder +buildBackground bkg = + case bkg of + Background typ col sty -> + fromByteString "<background type=\""+ <> fromByteString typ+ <> fromByteString "\" color=\""+ <> fromByteString col+ <> fromByteString "\" style=\""+ <> fromByteString sty+ <> fromByteString "\"/>\n"+ BackgroundPdf typ mdom mfile pageno -> + fromByteString "<background type=\""+ <> fromByteString typ+ <> case mdom of + Nothing -> fromByteString S.empty + Just dom -> fromByteString "\" domain=\""+ <> fromByteString dom+ <> case mfile of + Nothing -> fromByteString S.empty + Just file -> fromByteString "\" filename=\""+ <> fromByteString file+ <> fromByteString "\" pageno=\""+ <> fromString (show pageno)+ <> fromByteString "\"/>\n"+ +-- | +buildLayer :: Layer -> Builder+buildLayer layer = fromByteString "<layer>\n"+ <> (mconcat . map buildItem . view items) layer+ <> fromByteString "</layer>\n"++buildItem :: Item -> Builder+buildItem (ItemStroke strk) = buildStroke strk+buildItem (ItemImage img) = buildImage img+buildItem (ItemSVG svg) = buildSVG svg ++-- | +buildStroke :: Stroke -> Builder+buildStroke stroke@(Stroke _ _ _ _) = + fromByteString "<stroke tool=\""+ <> fromByteString (stroke_tool stroke)+ <> fromByteString "\" color=\""+ <> fromByteString (stroke_color stroke)+ <> fromByteString "\" width=\""+ <> fromByteString (toFixed 2 (stroke_width stroke))+ <> fromByteString "\">\n"+ <> mconcat (map build2D (stroke_data stroke))+ <> fromByteString "\n</stroke>\n"+buildStroke stroke@(VWStroke _ _ _) =+ fromByteString "<stroke tool=\""+ <> fromByteString (stroke_tool stroke)+ <> fromByteString "\" color=\""+ <> fromByteString (stroke_color stroke)+ <> fromByteString "\" width=\""+ <> mconcat (map buildZFrm3D (stroke_vwdata stroke))+ <> fromByteString "\">\n"+ <> mconcat (map buildXYFrm3D (stroke_vwdata stroke))+ <> fromByteString "\n</stroke>\n"++buildImage :: Image -> Builder +buildImage (Image bstr (x,y) (Dim w h)) =+ fromByteString "<img src=\""+ <> fromByteString bstr+ <> fromByteString "\" x=\"" + <> fromByteString (toFixed 2 x)+ <> fromByteString "\" y=\""+ <> fromByteString (toFixed 2 y)+ <> fromByteString "\" width=\""+ <> fromByteString (toFixed 2 w)+ <> fromByteString "\" height=\""+ <> fromByteString (toFixed 2 h)+ <> fromByteString "\" />\n"++buildSVG :: SVG -> Builder +buildSVG (SVG mtxt mcmd rdr (x,y) (Dim w h)) =+ fromByteString "<svgobject x=\"" + <> fromByteString (toFixed 2 x)+ <> fromByteString "\" y=\""+ <> fromByteString (toFixed 2 y)+ <> fromByteString "\" width=\""+ <> fromByteString (toFixed 2 w)+ <> fromByteString "\" height=\""+ <> fromByteString (toFixed 2 h)+ <> fromByteString "\" >\n"+ <> maybe mempty (\txt->fromByteString "<text><![CDATA[" <> fromByteString txt <> fromByteString "]]></text>") mtxt + <> maybe mempty (\cmd->fromByteString "<command><![CDATA[" <> fromByteString cmd <> fromByteString "]]></command>") mcmd + <> fromByteString "<render><![CDATA[" + <> fromByteString rdr + <> fromByteString "]]></render>"+ <> fromByteString "</svgobject>"++-- | +build2D :: Pair Double Double -> Builder +build2D (x :!: y) = fromByteString (toFixed 2 x) + <> fromChar ' ' + <> fromByteString (toFixed 2 y) + <> fromChar ' ' + +-- | +buildXYFrm3D :: (Double,Double,Double) -> Builder +buildXYFrm3D (x,y,_) = fromByteString (toFixed 2 x) + <> fromChar ' ' + <> fromByteString (toFixed 2 y)+ <> fromChar ' ' + +-- |+buildZFrm3D :: (Double,Double,Double) -> Builder +buildZFrm3D (_,_,z) = fromByteString (toFixed 2 z) + <> fromChar ' '