Commit 9a598c97 authored by Henrik Tramberend's avatar Henrik Tramberend
Browse files

Use shake for parallel rendering of included code

parent 1ed72945
......@@ -51,8 +51,7 @@ main = do
let indexA = return [index] :: Action [FilePath]
let everythingA = decksA <++> handoutsA <++> pagesA
let everythingPdfA = decksPdfA <++> handoutsPdfA <++> pagesPdfA
let cruft =
map (combine (project dirs)) ["index.md.generated", "log/", "//.shake/"]
let cruft = ["index.md.generated", "log/", "//.shake/", "generated/"]
context <- makeActionContext dirs
runShakeInContext context options $
--
......@@ -83,7 +82,7 @@ main = do
--
phony "server" $ do
need ["watch"]
runHttpServer serverPort dirs (Just serverUrl)
runHttpServer serverPort dirs Nothing
--
phony "example" writeExampleProject
--
......@@ -145,6 +144,22 @@ main = do
need $ decks ++ handouts ++ pages
writeIndex out (takeDirectory index) decks handouts pages
--
priority 2 $
"//*.dot.svg" %> \out -> do
let src = dropExtension out
need [src]
cmd "dot -Tsvg" ("-o" ++ out) src
--
priority 2 $
"//*.gnuplot.svg" %> \out -> do
let src = dropExtension out
need [src]
cmd
"gnuplot -d"
["-e", "set terminal svg"]
["-e", "set output \"" ++ out ++ "\""]
src
--
phony "clean" $ do
removeFilesAfter publicDir ["//"]
removeFilesAfter projectDir cruft
......
......@@ -22,12 +22,13 @@ cabal-version: >=1.10
executable decker
hs-source-dirs: app, src
main-is: decker.hs
other-modules: Action, Cache, Meta, Watch, Embed, Context, Utilities, Filter, Project, Common, Server, Resources, Render, Paths_decker
other-modules: Action, Cache, CRC32, Meta, Watch, Embed, Context, Utilities, Filter, Project, Common, Server, Resources, Render, Paths_decker
ghc-options: -threaded -rtsopts -with-rtsopts=-N
build-depends: base
, Glob
, HTTP
, aeson
, array
, base64-bytestring
, blaze-html
, blaze-markup
......@@ -58,6 +59,7 @@ executable decker
, snap-core
, snap-server
, split
, temporary
, text
, time
, transformers
......
set samples 20, 20
set isosamples 20, 20
set hidden3d back offset 1 trianglepattern 3 undefined 1 altdiagonal bentover
set style data lines
set xrange [ -3.00000 : 3.00000 ] noreverse nowriteback
set yrange [ -2.00000 : 2.00000 ] noreverse nowriteback
DEBUG_TERM_HTIC = 119
DEBUG_TERM_VTIC = 118
splot 1 / (x*x + y*y + 2)
\ No newline at end of file
This diff is collapsed.
set samples 20, 20
set isosamples 20, 20
set hidden3d back offset 1 trianglepattern 3 undefined 1 altdiagonal bentover
set style data lines
set xrange [ -3.00000 : 3.00000 ] noreverse nowriteback
set yrange [ -2.00000 : 2.00000 ] noreverse nowriteback
DEBUG_TERM_HTIC = 119
DEBUG_TERM_VTIC = 118
splot 1 / (x*x + y*y + 1)
\ No newline at end of file
This diff is collapsed.
digraph {
node [style = filled]
A [fillcolor = yellowgreen]
A -> B
A -> C
C -> D
C -> E
C -> F
B -> D
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Generated by graphviz version 2.40.1 (20161225.0304)
-->
<!-- Title: %3 Pages: 1 -->
<svg width="206pt" height="188pt"
viewBox="0.00 0.00 206.00 188.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 184)">
<title>%3</title>
<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-184 202,-184 202,4 -4,4"/>
<!-- A -->
<g id="node1" class="node">
<title>A</title>
<ellipse fill="#9acd32" stroke="#000000" cx="63" cy="-162" rx="27" ry="18"/>
<text text-anchor="middle" x="63" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">A</text>
</g>
<!-- B -->
<g id="node2" class="node">
<title>B</title>
<ellipse fill="#d3d3d3" stroke="#000000" cx="27" cy="-90" rx="27" ry="18"/>
<text text-anchor="middle" x="27" y="-85.8" font-family="Times,serif" font-size="14.00" fill="#000000">B</text>
</g>
<!-- A&#45;&gt;B -->
<g id="edge1" class="edge">
<title>A&#45;&gt;B</title>
<path fill="none" stroke="#000000" d="M54.2854,-144.5708C50.0403,-136.0807 44.8464,-125.6929 40.1337,-116.2674"/>
<polygon fill="#000000" stroke="#000000" points="43.237,-114.6477 35.6343,-107.2687 36.976,-117.7782 43.237,-114.6477"/>
</g>
<!-- C -->
<g id="node3" class="node">
<title>C</title>
<ellipse fill="#d3d3d3" stroke="#000000" cx="99" cy="-90" rx="27" ry="18"/>
<text text-anchor="middle" x="99" y="-85.8" font-family="Times,serif" font-size="14.00" fill="#000000">C</text>
</g>
<!-- A&#45;&gt;C -->
<g id="edge2" class="edge">
<title>A&#45;&gt;C</title>
<path fill="none" stroke="#000000" d="M71.7146,-144.5708C75.9597,-136.0807 81.1536,-125.6929 85.8663,-116.2674"/>
<polygon fill="#000000" stroke="#000000" points="89.024,-117.7782 90.3657,-107.2687 82.763,-114.6477 89.024,-117.7782"/>
</g>
<!-- D -->
<g id="node4" class="node">
<title>D</title>
<ellipse fill="#d3d3d3" stroke="#000000" cx="27" cy="-18" rx="27" ry="18"/>
<text text-anchor="middle" x="27" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#000000">D</text>
</g>
<!-- B&#45;&gt;D -->
<g id="edge6" class="edge">
<title>B&#45;&gt;D</title>
<path fill="none" stroke="#000000" d="M27,-71.8314C27,-64.131 27,-54.9743 27,-46.4166"/>
<polygon fill="#000000" stroke="#000000" points="30.5001,-46.4132 27,-36.4133 23.5001,-46.4133 30.5001,-46.4132"/>
</g>
<!-- C&#45;&gt;D -->
<g id="edge3" class="edge">
<title>C&#45;&gt;D</title>
<path fill="none" stroke="#000000" d="M83.7307,-74.7307C73.803,-64.803 60.6847,-51.6847 49.5637,-40.5637"/>
<polygon fill="#000000" stroke="#000000" points="51.7933,-37.8436 42.2473,-33.2473 46.8436,-42.7933 51.7933,-37.8436"/>
</g>
<!-- E -->
<g id="node5" class="node">
<title>E</title>
<ellipse fill="#d3d3d3" stroke="#000000" cx="99" cy="-18" rx="27" ry="18"/>
<text text-anchor="middle" x="99" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#000000">E</text>
</g>
<!-- C&#45;&gt;E -->
<g id="edge4" class="edge">
<title>C&#45;&gt;E</title>
<path fill="none" stroke="#000000" d="M99,-71.8314C99,-64.131 99,-54.9743 99,-46.4166"/>
<polygon fill="#000000" stroke="#000000" points="102.5001,-46.4132 99,-36.4133 95.5001,-46.4133 102.5001,-46.4132"/>
</g>
<!-- F -->
<g id="node6" class="node">
<title>F</title>
<ellipse fill="#d3d3d3" stroke="#000000" cx="171" cy="-18" rx="27" ry="18"/>
<text text-anchor="middle" x="171" y="-13.8" font-family="Times,serif" font-size="14.00" fill="#000000">F</text>
</g>
<!-- C&#45;&gt;F -->
<g id="edge5" class="edge">
<title>C&#45;&gt;F</title>
<path fill="none" stroke="#000000" d="M114.2693,-74.7307C124.197,-64.803 137.3153,-51.6847 148.4363,-40.5637"/>
<polygon fill="#000000" stroke="#000000" points="151.1564,-42.7933 155.7527,-33.2473 146.2067,-37.8436 151.1564,-42.7933"/>
</g>
</g>
</svg>
set samples 20, 20
set isosamples 20, 20
set hidden3d back offset 1 trianglepattern 3 undefined 1 altdiagonal bentover
set style data lines
set xrange [ -3.00000 : 3.00000 ] noreverse nowriteback
set yrange [ -2.00000 : 2.00000 ] noreverse nowriteback
DEBUG_TERM_HTIC = 119
DEBUG_TERM_VTIC = 118
splot 1 / (x*x + y*y + 0.5)
\ No newline at end of file
This diff is collapsed.
......@@ -40,7 +40,6 @@ transition: linear
- Level 1 header (`#`) starts new slide
- Level 2 header (`##`) starts a block on a slide
- Level 3 header (`###`) starts new column on a slide
``` {.markdown}
# Episode IV: A new Slide
......@@ -60,25 +59,21 @@ The following text is included from file `/resource/realtive.md`:
# Multicolumn slides
## The author
## The author {.split}
![](img/htr-beuth.jpg){width="50%"}
[Deck markdown source](example-deck.md)
###
## Slide source
``` {.markdown}
# Multicolumn slides
# Multicolumn slides {.split}
## The author
![](img/htr-beuth.jpg){data-src="img/htr-beuth.jpg"}
###
## Slide source
~~~ {.markdown}
......@@ -110,7 +105,7 @@ $$
# Compile Time Macros
## Macros
## Macros {.split}
- Appropriated link `[Link text](Url)` and image `![Alt text](Url)` syntax
- Example: embed a YouTube video
......@@ -121,8 +116,6 @@ $$
[:youtube](Wji-BZ0oCwg)
```
###
## Video
[:youtube](Wji-BZ0oCwg)
......@@ -155,7 +148,7 @@ $$
# Blocks
## Block markup
## Block markup {.split}
- Level 2 headers start new block
- Blocks can be marked with attributes
......@@ -170,8 +163,6 @@ $$
- This block is marked `.alert`
```
###
## Block styles
- Other block styles include `definition` and `equation`
......@@ -186,7 +177,7 @@ $e=mc^2$
# Speaker Notes
## Slide level
## Slide level {.split}
- The slide content becomes part of the speaker notes
- Add `notes` class to slide header
......@@ -197,8 +188,6 @@ $e=mc^2$
These are speaker notes.
```
###
## Block level
- Block content becomes part of the speaker notes
......@@ -216,7 +205,7 @@ Slides with headers that are have the `.notes` class attribute are not included
# Cached Images
## Local image cache
## Local image cache {.split}
Remote images can be cached locally
......@@ -224,8 +213,6 @@ Cache directory is named `img/cached` and is located in the directory of the ref
`decker cache` scans for and downloads all images
###
## Cached remote image
<!--
......
{-# LANGUAGE Safe #-}
{- arch-tag: GZIP CRC32 implementation in pure Haskell
Copyright (c) 2004-2011 John Goerzen <jgoerzen@complete.org>
All rights reserved.
For license and copyright information, see the file LICENSE
-}
{- |
Module : Data.Hash.CRC32.GZip
Copyright : Copyright (C) 2004-2011 John Goerzen
License : BSD3
Maintainer : John Goerzen <jgoerzen@complete.org>
Stability : provisional
Portability: portable
CRC32 checksumming using the GZIP\/PKZIP algorithm as used in both
ISO 3309 and section 8.1.1.6.2 of ITU-T V.42 and referenced in
RFC1952.
-}
module CRC32 where
import Data.Array
import Data.Bits
import Data.Word
import Data.List
import Data.Char
update_crc :: Word32 -> Char -> Word32
update_crc crc ch =
let c = crc `xor` 0xFFFFFFFF
newval = (gzipcrctab ! fromIntegral ((c `xor` fromIntegral (ord ch)) .&. 0xff))
`xor` (c `shiftR` 8)
in
newval `xor` 0xFFFFFFFF
update_crc_list :: Word32 -> [Char] -> Word32
update_crc_list start list = foldl update_crc start list
calc_crc32 :: [Char] -> Word32
calc_crc32 s = update_crc_list 0 s
gzipcrctab :: Array Int Word32
gzipcrctab = array (0,255) (zip [0..255]
[
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419,
0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07,
0x90bf1d91, 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, 0x136c9856,
0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4,
0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3,
0x45df5c75, 0xdcd60dcf, 0xabd13d59, 0x26d930ac, 0x51de003a,
0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599,
0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190,
0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f,
0x9fbfe4a5, 0xe8b8d433, 0x7807c9a2, 0x0f00f934, 0x9609a88e,
0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed,
0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3,
0xfbd44c65, 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a,
0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5,
0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, 0xbe0b1010,
0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17,
0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6,
0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615,
0x73dc1683, 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, 0xf00f9344,
0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a,
0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1,
0xa6bc5767, 0x3fb506dd, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef,
0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe,
0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31,
0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226, 0x756aa39c,
0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b,
0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1,
0x18b74777, 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, 0xa00ae278,
0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66,
0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605,
0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b,
0x2d02ef8d ])
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -11,7 +11,6 @@ import Control.Exception
import Control.Monad
import Extra
import System.Directory
import System.Environment
import System.Exit
import System.FilePath.Posix
import System.Process
......
This diff is collapsed.
......@@ -8,14 +8,14 @@ import Control.Concurrent.MVar
import Data.List
import qualified Data.Set as Set
import Filter
import Render
import System.FSNotify
import System.FilePath
import System.FilePath.Glob
-- | Wait for something to happen on one of the matching files
-- in one of the supplied directories.
waitForTwitch :: [FilePath] -> [Pattern] -> IO FilePath
waitForTwitch directories patterns = do
waitForTwitch :: [FilePath] -> IO FilePath
waitForTwitch directories = do
done <- newEmptyMVar
mgr <- startManager
stops <- watchIt mgr done
......@@ -25,29 +25,28 @@ waitForTwitch directories patterns = do
return filepath
-- Match a filepath against the supplied patterns
where
isWatchedFile event = any (`match` eventPath event) patterns
isWatchedFile event =
(takeExtension . eventPath) event `elem` twitchExtensions
-- Stop the watch manager and notify the main thread
stopWatching mgr done event = putMVar done (eventPath event)
stopWatching _ done event = putMVar done (eventPath event)
-- Watch everything within the supplied dirs
watchInDir mgr done dir =
watchTree mgr dir isWatchedFile (stopWatching mgr done)
watchIt mgr done = mapM (watchInDir mgr done) (unique directories)
twitchPatterns =
map compile $
[ "**/*.css"
, "**/*.md"
, "**/*.yaml"
, "**/*.png"
, "**/*.gif"
, "**/*.jpg"
, "**/*.svg"
] ++
iframeExtensions ++ audioExtensions ++ videoExtensions
commonExtensions :: [String]
commonExtensions = [".css", ".md", ".yaml", ".png", ".gif", ".jpg", ".svg"]
twitchExtensions :: [String]
twitchExtensions =
commonExtensions ++
iframeExtensions ++
audioExtensions ++ videoExtensions ++ renderedCodeExtensions
waitForTwitchPassive :: [FilePath] -> IO FilePath
waitForTwitchPassive files = do
let dirs = nub (map takeDirectory files)
waitForTwitch dirs twitchPatterns
waitForTwitch dirs
unique :: Ord a => [a] -> [a]
unique = Set.toList . Set.fromList
This diff is collapsed.
digraph {
node [style = filled]
A [fillcolor = yellowgreen]
A -> B
A -> C
C -> D
C -> E
C -> F
B -> D
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment