carettah 0.1.2 → 0.2.0

raw patch · 3 files changed

+12/−12 lines, 3 files

Files

• Carettah.hs +6/−6
• Config.hs +2/−2
• carettah.cabal +4/−4

@@ -21,15 +21,15 @@ import WrapPaths  markdown :: String -> P.Pandoc-markdown = P.readMarkdown P.defaultParserState{ P.stateStandalone = True }+markdown = P.readMarkdown P.def{ P.readerStandalone = True }  splitBlocks :: P.Pandoc -> [[P.Block]] splitBlocks (P.Pandoc _ blocks) = go blocks-  where go (P.Header 1 h:xs) =+  where go (P.Header 1 _ h:xs) =           let (b1, b2) = break check xs-          in (P.Header 1 h:b1):go b2+          in (P.Header 1 P.nullAttr h:b1):go b2         go _ = []-        check (P.Header 1 _) = True+        check (P.Header 1 _ _) = True         check _ = False  backgroundTop :: [P.Block] -> [P.Block]@@ -60,7 +60,7 @@     go (P.Para [P.Image [P.Str "inline"] (pngfile, _)]) =       \y -> renderPngInline (CCenter, CPosition y) (CFit, CFit)              1 pngfile-    go (P.Header 1 strs) =+    go (P.Header 1 _ strs) =       \y -> renderLayoutM (CCenter, CPosition tty) tts (inlinesToString strs) >> return y     go (P.BulletList plains) = \y -> yposSequence y $ map go' plains       where@@ -85,7 +85,7 @@     go :: P.Block -> Double -> C.Render Double     go (P.Para [P.Image [P.Str "background"] (pngfile, _)]) =       \y -> renderPngFit ag pngfile >> return y-    go (P.Header 1 strs) =+    go (P.Header 1 _ strs) =       \y -> renderLayoutM (CCenter, CPosition ttcy) ttcs (inlinesToString strs) >> return y     go (P.Para strs) =       \y -> renderLayoutM (CCenter, CPosition tccy) tccs (inlinesToString strs) >> return y

@@ -142,7 +142,7 @@ gCfg = Config {   canvasW   = 640,   canvasH  = 480,-  alphaBackG = 0.4,+  alphaBackG = 0.3,   textTitleCoverY = 170,   textTitleCoverSize = 30,   textContextCoverY = 300,@@ -156,5 +156,5 @@   textCodeBlockOfs = 10,   turtleSize = 40,   waveSize = 20,-  waveCharMax = 53 -- xxxxxx 本来はwaveSizeから検出すべき手で数えんなよwwww+  waveCharMax = 37 -- xxxxxx 本来はwaveSizeから検出すべき手で数えんなよwwww   }

@@ -1,17 +1,17 @@ Name:                   carettah-Version:                0.1.2+Version:                0.2.0 Author:                 Kiwamu Okabe <kiwamu@debian.or.jp> Maintainer:             Kiwamu Okabe <kiwamu@debian.or.jp> License:                GPL-2 License-File:           COPYING-Synopsis:               A presentation tool writtten with Haskell.-Description:            A presentation tool writtten with Haskell.+Synopsis:               A presentation tool written with Haskell.+Description:            A presentation tool written with Haskell. Category:               Graphics Stability:              Experimental Cabal-Version:          >= 1.6 Build-Type:             Simple Homepage:               http://carettah.masterq.net/-Tested-with:            GHC == 7.4.1+Tested-with:            GHC == 7.6.3  data-files:             data/turtle.png, data/debian.png, data/notfound.png