-
-
-
diff --git a/lib/README.md b/lib/README.md
index 11cdd7a5..eaf227b0 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -4,7 +4,7 @@ Any **libraries** on which your project depends and which are **NOT managed via
This typically includes custom builds of third-party software, private (i.e. to a company) codebases, and native libraries.
---
-NOTE:
+NOTE:
This file is a placeholder, used to preserve directory structure in Git.
diff --git a/nuget/paket.template b/nuget/paket.template
index 2ba1709d..15793530 100644
--- a/nuget/paket.template
+++ b/nuget/paket.template
@@ -3,21 +3,18 @@ id FsReveal
description
FsReveal parses markdown or F# script files and generates reveal.js slides.
authors
- Karlkim Suwanmongkol
+ Karlkim Suwanmongkol, Steffen Forkmann, Henrik Feldt
+
licenseurl http://fsprojects.github.io/FsReveal/license.html
projecturl https://github.com/fsprojects/FsReveal
iconurl http://fsprojects.github.io/FsReveal/img/logo-2.png
+
tags
F#, markdown, reveal.js
files
- ../bin/FsReveal.* ==> lib/net40
- ../bin/FSharp.Compiler.Interactive.Settings.dll ==> lib/net40
- ../paket-files/fsprojects/reveal.js/**/*.* ==> reveal.js
- ../src/FsReveal/style.css ==> reveal.js/fsharp.formatting/styles
- ../src/FsReveal/tips.js ==> reveal.js/fsharp.formatting/styles
- ../src/FsReveal/deedle.css ==> reveal.js/fsharp.formatting/styles
- ../src/FsReveal/template.html ==> fsreveal
- ../src/FsReveal/fsreveal.fsx ==> fsreveal
- ../src/FsReveal/fsreveal.css ==> fsreveal
+ ../src/FsReveal/bin/Release/FsReveal.* ==> lib/net461
+ ../src/FsReveal/bin/Release/FSharp.Compiler.Interactive.Settings.dll ==> lib/net461
+ ../dist/**/*.* ==> tools
+ ../src/FsReveal/fsreveal.fsx ==> tools
dependencies
FSharp.Formatting >= 2.11.0
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..58336543
--- /dev/null
+++ b/package.json
@@ -0,0 +1,43 @@
+{
+ "name": "fsreveal",
+ "version": "1.4.0",
+ "description": "FsReveal parses markdown or F# script files and generates reveal.js slides.",
+ "main": "index.js",
+ "repository": {
+ "url": "https://github.com/fsprojects/FsReveal/",
+ "type": "git"
+ },
+ "author": "Karlkim Suwamongkol , Troy Kershaw, Steffen Forkmann ",
+ "license": "MIT",
+ "dependencies": {
+ "babel-core": "^6.18.2",
+ "babel-loader": "^6.2.7",
+ "babel-preset-es2015": "^6.18.0",
+ "babel-runtime": "^6.18.0",
+ "css-loader": "^0.25.0",
+ "exports-loader": "^0.6.3",
+ "expose-loader": "^0.7.1",
+ "file-loader": "^0.9.0",
+ "highlight.js": "^9.8.0",
+ "html-loader": "^0.4.4",
+ "html-webpack-plugin": "^2.24.1",
+ "imports-loader": "^0.6.5",
+ "mathjax": "^2.7.0",
+ "offline-plugin": "^3.4.2",
+ "raw-loader": "^0.5.1",
+ "script-loader": "^0.7.0",
+ "style-loader": "^0.13.1",
+ "url-loader": "^0.5.7",
+ "webpack": "^1.13.3"
+ },
+ "engines": {
+ "node": ">=6.9.1"
+ },
+ "scripts": {
+ "watch": "webpack -p --display-modules --progress --colors --watch",
+ "build": "webpack -p --display-modules --progress --colors"
+ },
+ "devDependencies": {
+ "babel-plugin-transform-runtime": "^6.15.0"
+ }
+}
diff --git a/paket.dependencies b/paket.dependencies
index 7f17a049..f4a00bd9 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -1,18 +1,21 @@
source https://nuget.org/api/v2
redirects: on
+framework net461
nuget FSharp.Formatting
nuget FSharp.Core
+github logary/logary src/Logary.Facade/Facade.fs
github fsprojects/reveal.js:master
group Build
- source https://nuget.org/api/v2
+ framework net461
+ source https://nuget.org/api/v2
nuget FAKE
nuget SourceLink.Fake
github fsharp/FAKE modules/Octokit/Octokit.fsx
group Test
+ framework net461
source https://nuget.org/api/v2
- nuget NUnit ~> 2
- nuget NUnit.Runners ~> 2
- github forki/FsUnit FsUnit.fs
\ No newline at end of file
+ nuget Expecto
+ nuget Expecto.FsCheck
diff --git a/paket.lock b/paket.lock
index c432d4e1..d7f8bf75 100644
--- a/paket.lock
+++ b/paket.lock
@@ -1,38 +1,48 @@
REDIRECTS: ON
+FRAMEWORK: NET461
NUGET
remote: https://www.nuget.org/api/v2
FSharp.Compiler.Service (2.0.0.6)
- FSharp.Core (4.0.0.1)
+ FSharp.Core (4.1.17)
+ System.ValueTuple (>= 4.3)
FSharp.Formatting (2.14.4)
FSharp.Compiler.Service (2.0.0.6)
FSharpVSPowerTools.Core (>= 2.3 < 2.4)
FSharpVSPowerTools.Core (2.3)
FSharp.Compiler.Service (>= 2.0.0.3)
+ System.ValueTuple (4.3.1)
GITHUB
+ remote: logary/logary
+ src/Logary.Facade/Facade.fs (f1d5a7bd317381f014d50ed693e507505b207616)
remote: fsprojects/reveal.js
FULLPROJECT (539e774d31f91676bcc3f75e28168921cd27d819)
GROUP Build
+FRAMEWORK: NET461
NUGET
remote: https://www.nuget.org/api/v2
- FAKE (4.28)
- Microsoft.Bcl (1.1.10) - framework: net10, net11, net20, net30, net35, net40, net40-full
- Microsoft.Bcl.Build (>= 1.0.14)
- Microsoft.Bcl.Build (1.0.21) - import_targets: false, framework: net10, net11, net20, net30, net35, net40, net40-full
- Microsoft.Net.Http (2.2.29) - framework: net10, net11, net20, net30, net35, net40, net40-full
- Microsoft.Bcl (>= 1.1.10)
- Microsoft.Bcl.Build (>= 1.0.14)
- Octokit (0.20)
- Microsoft.Net.Http - framework: net10, net11, net20, net30, net35, net40, net40-full
+ FAKE (4.61.2)
+ Octokit (0.24)
SourceLink.Fake (1.1)
GITHUB
remote: fsharp/FAKE
- modules/Octokit/Octokit.fsx (5a9789b05e5713b55ea996baf8feb3561b6b926d)
- Octokit
+ modules/Octokit/Octokit.fsx (1ada6a9c84aada940bd7e6a7b63c0dc62e2fa56e)
+ Octokit (>= 0.20)
GROUP Test
+FRAMEWORK: NET461
NUGET
remote: https://www.nuget.org/api/v2
- NUnit (2.6.4)
- NUnit.Runners (2.6.4)
-GITHUB
- remote: forki/FsUnit
- FsUnit.fs (f536bd5ed0eba8b38d2b01ae79d64e4e14fbd0a6)
\ No newline at end of file
+ Argu (3.7)
+ Expecto (4.2.1)
+ Argu (>= 3.7)
+ FSharp.Core (>= 4.1.12)
+ Mono.Cecil (>= 0.9.6.4)
+ Expecto.FsCheck (4.2.1)
+ Expecto (>= 4.2.1)
+ FsCheck (>= 2.8)
+ FSharp.Core (>= 4.1.12)
+ FsCheck (2.9)
+ FSharp.Core (>= 4.1)
+ FSharp.Core (4.1.17)
+ System.ValueTuple (>= 4.3)
+ Mono.Cecil (0.9.6.4)
+ System.ValueTuple (4.3.1)
diff --git a/src/FsReveal/App.config b/src/FsReveal/App.config
index ba41caea..fa0dece8 100644
--- a/src/FsReveal/App.config
+++ b/src/FsReveal/App.config
@@ -4,6 +4,6 @@
True
-
+
diff --git a/src/FsReveal/AssemblyInfo.fs b/src/FsReveal/AssemblyInfo.fs
index af5c4ba8..ec0270c1 100644
--- a/src/FsReveal/AssemblyInfo.fs
+++ b/src/FsReveal/AssemblyInfo.fs
@@ -1,13 +1,17 @@
-namespace System
+// Auto-Generated by FAKE; do not edit
+namespace System
open System.Reflection
[]
[]
[]
-[]
-[]
+[]
+[]
do ()
module internal AssemblyVersionInformation =
- let [] Version = "1.3.1"
- let [] InformationalVersion = "1.3.1"
+ let [] AssemblyTitle = "FsReveal"
+ let [] AssemblyProduct = "FsReveal"
+ let [] AssemblyDescription = "FsReveal parses markdown or F# script files and generates reveal.js slides."
+ let [] AssemblyVersion = "1.4.0"
+ let [] AssemblyFileVersion = "1.4.0"
diff --git a/src/FsReveal/Domain.fs b/src/FsReveal/Domain.fs
index 43fcde45..8e285e4b 100644
--- a/src/FsReveal/Domain.fs
+++ b/src/FsReveal/Domain.fs
@@ -8,15 +8,15 @@ open FSharp.Literate
open FSharp.Markdown
open FSharp.Markdown.Html
-type SlideData =
+type SlideData =
{ Properties : Map
Paragraphs : MarkdownParagraph list }
-type Slide =
+type Slide =
| Simple of SlideData
| Nested of SlideData list
-type Presentation =
+type Presentation =
{ Properties : Map
Slides : Slide list
Document : LiterateDocument }
diff --git a/src/FsReveal/Formatting.fs b/src/FsReveal/Formatting.fs
index e3a63c98..7449c1ff 100644
--- a/src/FsReveal/Formatting.fs
+++ b/src/FsReveal/Formatting.fs
@@ -12,20 +12,20 @@ let (|SpeakerNote|OtherLine|) (line : string) =
let replaceSpeakerNotes text =
let rec loop inNotes = function
- | (SpeakerNote note) :: lines ->
+ | (SpeakerNote note) :: lines ->
if inNotes then note::(loop true lines)
else ""::line::(loop false lines)
else line::(loop false lines)
| _ -> []
text |> Array.toList |> loop false
-let preprocessing (text : string []) =
- text
+let preprocessing (text : string []) =
+ text
|> replaceSpeakerNotes
|> fun s -> String.Join(Environment.NewLine,s)
-
+
/// Generates a HTML page from a presentation
let GenerateHTML (template:string) presentation =
let doc = Literate.FormatLiterateNodes presentation.Document
diff --git a/src/FsReveal/FsReveal.fs b/src/FsReveal/FsReveal.fs
index 49dc4eba..38a6f17c 100644
--- a/src/FsReveal/FsReveal.fs
+++ b/src/FsReveal/FsReveal.fs
@@ -7,108 +7,128 @@ open System.Text
open FSharp.Literate
open FSharp.Markdown
open FSharp.Markdown.Html
+open FsReveal.Logging
+open FsReveal.Logging.Message
-module FsRevealHelper =
+module FsRevealHelper =
// used to change the working directory
- let mutable RevealJsFolder = __SOURCE_DIRECTORY__
- let mutable TemplateFile = Path.Combine(__SOURCE_DIRECTORY__,"template.html")
+ let mutable DistFolder = __SOURCE_DIRECTORY__
+ let mutable TemplateFile = Path.Combine(__SOURCE_DIRECTORY__, "template.html")
let mutable StyleFile = Path.Combine(__SOURCE_DIRECTORY__,"fsreveal.css")
-type FsReveal private() =
- static let defaultFileName (other:FileInfo) optInput =
- match optInput with
- | Some fn -> fn
- | None -> other.Name.Replace(other.Extension, ".html")
-
- static let generateOutput outDir outFile presentation =
- if Directory.Exists outDir |> not then
- Directory.CreateDirectory outDir |> ignore
- printfn "Creating %s.." outDir
- printfn "Copy reveal.js files from %s to %s" FsRevealHelper.RevealJsFolder outDir
- copyFiles (fun f -> f.ToLower().Contains("index.html")) FsRevealHelper.RevealJsFolder outDir
- // delete overhead
- File.Delete(outDir @@ "README.md")
- let di = DirectoryInfo(outDir @@ "test")
- if di.Exists then di.Delete(true)
- let template = File.ReadAllText(FsRevealHelper.TemplateFile)
- printfn "Apply template : %s" FsRevealHelper.TemplateFile
- let output = Formatting.GenerateHTML template presentation
- File.WriteAllText(outDir @@ outFile, output)
- let cssDir = outDir @@ "css"
- printfn "Copy fsreveal.css style from %s to %s" FsRevealHelper.StyleFile cssDir
- if Directory.Exists cssDir |> not then
- Directory.CreateDirectory cssDir |> ignore
- printfn "Creating %s.." cssDir
-
- File.Copy(FsRevealHelper.StyleFile, cssDir @@ "fsreveal.css", true)
-
- static let getPresentationFromScriptLines fsxFile fsiEvaluator lines =
- let fsx = Formatting.preprocessing lines
- Literate.ParseScriptString(fsx, ?path=Option.map Path.GetFullPath fsxFile, ?fsiEvaluator = fsiEvaluator)
- |> getPresentation
-
- static let getPresentationFromMarkdownLines mdFile fsiEvaluator lines =
- let md = Formatting.preprocessing lines
- Literate.ParseMarkdownString(md, ?path=Option.map Path.GetFullPath mdFile, ?fsiEvaluator = fsiEvaluator)
- |> getPresentation
-
- static let checkIfFileExistsAndRun file f =
- if File.Exists file then f()
- else printfn "%s does not exist. Abort!" file
-
- /// Creates a presentation from an F# Script file specified as string. This also evaluates
- /// all F# code snippets in the presentation and embeds the outputs. If you do not specify
- /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
- static member GetPresentationFromScriptString(text : string, ?fsxFile, ?fsiEvaluator) =
- normalizeLineBreaks(text).Split('\n')
- |> getPresentationFromScriptLines fsxFile fsiEvaluator
-
- /// Creates a presentation from a Markdown source file specified as string. This also evaluates
- /// all F# code snippets in the presentation and embeds the outputs. If you do not specify
- /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
- static member GetPresentationFromMarkdown(text : string, ?mdFile, ?fsiEvaluator) =
- normalizeLineBreaks(text).Split('\n')
- |> getPresentationFromMarkdownLines mdFile fsiEvaluator
-
- /// Write the specified presentation to a specified file in the output directory.
- /// (if a file name is not specified, the default `index.html` will be used)
- static member GenerateOutput(presentation, outDir, ?outFile) =
- generateOutput outDir (defaultArg outFile "index.html") presentation
-
- /// Processes a presentation specified as an F# Script. This also evaluates all
- /// F# code snippets in the presentation and embeds the outputs. If you do not specify
- /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
- static member GenerateOutputFromScriptFile(fsxFile, outDir, ?outFile, ?fsiEvaluator) =
- checkIfFileExistsAndRun fsxFile (fun () ->
- fsxFile
- |> File.ReadAllLines
- |> getPresentationFromScriptLines (Some fsxFile) fsiEvaluator
- |> generateOutput outDir (defaultFileName (FileInfo fsxFile) outFile))
-
- /// Processes a presentation specified as a Markdown. This also evaluates all
- /// F# code snippets in the presentation and embeds the outputs. If you do not specify
- /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
- static member GenerateOutputFromMarkdownFile(mdFile, outDir, ?outFile, ?fsiEvaluator) =
- checkIfFileExistsAndRun mdFile (fun () ->
- mdFile
- |> File.ReadAllLines
- |> getPresentationFromMarkdownLines (Some mdFile) fsiEvaluator
- |> generateOutput outDir (defaultFileName (FileInfo mdFile) outFile))
-
- /// Processes a presentation specified as an F# Script file or a Markdown document.
- /// (When the file name has extension other than `fsx` or `md`, nothing happens).
- ///
- /// The method evaluates F# code snippets in the presentation and embeds the outputs. You
- /// can specify a custom `fsiEvaluator` to add formatting for custom values and handle errors
- /// during the valuation.
- ///
- /// ## Parameters
- /// - `fsiEvaluator` - Custom evaluator (you can use this parameter to add custom formatting
- /// that turns values into HTML when embedding them into the presentation)
- static member GenerateFromFile(fileName, outDir, ?outFile, ?fsiEvaluator) =
- let file = FileInfo fileName
- let outputFileName = defaultFileName file outFile
- match file.Extension with
- | ".md" -> FsReveal.GenerateOutputFromMarkdownFile(file.FullName, outDir, outputFileName, ?fsiEvaluator=fsiEvaluator)
- | ".fsx" -> FsReveal.GenerateOutputFromScriptFile(file.FullName, outDir, outputFileName, ?fsiEvaluator=fsiEvaluator)
- | _ -> ()
+type FsReveal private() =
+ static let logger = Log.create "FsReveal"
+ static let defaultFileName (other:FileInfo) optInput =
+ match optInput with
+ | Some fn ->
+ fn
+ | None ->
+ other.Name.Replace(other.Extension, ".html")
+
+ static let generateOutput outDir outFile presentation =
+ if not (Directory.Exists outDir) then
+ ignore (Directory.CreateDirectory outDir)
+ logger.info (eventX "Creating {outDir}..." >> setField "outDir" outDir)
+
+ logger.info (
+ eventX "Copy compiled JS files from {distFolder} to {outDir}"
+ >> setField "distFolder" FsRevealHelper.DistFolder
+ >> setField "outDir" outDir)
+
+ copyFiles (fun f -> f.ToLower().Contains("index.html")) FsRevealHelper.DistFolder outDir
+
+ File.Delete (outDir @@ "README.md")
+ let di = DirectoryInfo (outDir @@ "test")
+ if di.Exists then di.Delete(true)
+
+ let template = File.ReadAllText (FsRevealHelper.TemplateFile)
+ logger.info (eventX "Applying template {templatePath}"
+ >> setField "templatePath" FsRevealHelper.TemplateFile)
+ let output = Formatting.GenerateHTML template presentation
+ File.WriteAllText(outDir @@ outFile, output)
+
+ let cssDir = outDir @@ "css"
+ logger.info (
+ eventX "Copying fsreveal.css styles from {styleFilePath} to {cssDir}"
+ >> setField "styleFilePath" FsRevealHelper.StyleFile
+ >> setField "cssDir" cssDir)
+
+ if not (Directory.Exists cssDir)then
+ logger.info (eventX "Creating {cssDir}" >> setField "cssDir" cssDir)
+ ignore (Directory.CreateDirectory cssDir)
+
+ File.Copy (FsRevealHelper.StyleFile, cssDir @@ "fsreveal.css", true)
+
+ static let getPresentationFromScriptLines fsxFile fsiEvaluator lines =
+ let fsx = Formatting.preprocessing lines
+ Literate.ParseScriptString(fsx, ?path=Option.map Path.GetFullPath fsxFile, ?fsiEvaluator = fsiEvaluator)
+ |> getPresentation
+
+ static let getPresentationFromMarkdownLines mdFile fsiEvaluator lines =
+ let md = Formatting.preprocessing lines
+ Literate.ParseMarkdownString(md, ?path=Option.map Path.GetFullPath mdFile, ?fsiEvaluator = fsiEvaluator)
+ |> getPresentation
+
+ static let checkIfFileExistsAndRun file f =
+ if File.Exists file then f()
+ else logger.warn (eventX "{filePath} does not exist. Abort!" >> setField "filePath" file)
+
+ /// Creates a presentation from an F# Script file specified as string. This also evaluates
+ /// all F# code snippets in the presentation and embeds the outputs. If you do not specify
+ /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
+ static member GetPresentationFromScriptString(text : string, ?fsxFile, ?fsiEvaluator) =
+ normalizeLineBreaks(text).Split('\n')
+ |> getPresentationFromScriptLines fsxFile fsiEvaluator
+
+ /// Creates a presentation from a Markdown source file specified as string. This also evaluates
+ /// all F# code snippets in the presentation and embeds the outputs. If you do not specify
+ /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
+ static member GetPresentationFromMarkdown(text : string, ?mdFile, ?fsiEvaluator) =
+ normalizeLineBreaks(text).Split('\n')
+ |> getPresentationFromMarkdownLines mdFile fsiEvaluator
+
+ /// Write the specified presentation to a specified file in the output directory.
+ /// (if a file name is not specified, the default `index.html` will be used)
+ static member GenerateOutput(presentation, outDir, ?outFile) =
+ generateOutput outDir (defaultArg outFile "index.html") presentation
+
+ /// Processes a presentation specified as an F# Script. This also evaluates all
+ /// F# code snippets in the presentation and embeds the outputs. If you do not specify
+ /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
+ static member GenerateOutputFromScriptFile(fsxFile, outDir, ?outFile, ?fsiEvaluator) =
+ checkIfFileExistsAndRun fsxFile (fun () ->
+ fsxFile
+ |> File.ReadAllLines
+ |> getPresentationFromScriptLines (Some fsxFile) fsiEvaluator
+ |> generateOutput outDir (defaultFileName (FileInfo fsxFile) outFile))
+
+ /// Processes a presentation specified as a Markdown. This also evaluates all
+ /// F# code snippets in the presentation and embeds the outputs. If you do not specify
+ /// a custom FSI evaluator, a new default one is created. See `GenerateFromFile` for more info.
+ static member GenerateOutputFromMarkdownFile(mdFile, outDir, ?outFile, ?fsiEvaluator) =
+ checkIfFileExistsAndRun mdFile (fun () ->
+ mdFile
+ |> File.ReadAllLines
+ |> getPresentationFromMarkdownLines (Some mdFile) fsiEvaluator
+ |> generateOutput outDir (defaultFileName (FileInfo mdFile) outFile))
+
+ /// Processes a presentation specified as an F# Script file or a Markdown document.
+ /// (When the file name has extension other than `fsx` or `md`, nothing happens).
+ ///
+ /// The method evaluates F# code snippets in the presentation and embeds the outputs. You
+ /// can specify a custom `fsiEvaluator` to add formatting for custom values and handle errors
+ /// during the valuation.
+ ///
+ /// ## Parameters
+ /// - `fsiEvaluator` - Custom evaluator (you can use this parameter to add custom formatting
+ /// that turns values into HTML when embedding them into the presentation)
+ static member GenerateFromFile(fileName, outDir, ?outFile, ?fsiEvaluator) =
+ let file = FileInfo fileName
+ let outputFileName = defaultFileName file outFile
+ match file.Extension with
+ | ".md" ->
+ FsReveal.GenerateOutputFromMarkdownFile(file.FullName, outDir, outputFileName, ?fsiEvaluator=fsiEvaluator)
+ | ".fsx" ->
+ FsReveal.GenerateOutputFromScriptFile(file.FullName, outDir, outputFileName, ?fsiEvaluator=fsiEvaluator)
+ | _ ->
+ ()
\ No newline at end of file
diff --git a/src/FsReveal/FsReveal.fsproj b/src/FsReveal/FsReveal.fsproj
index 77a195da..c34a1824 100644
--- a/src/FsReveal/FsReveal.fsproj
+++ b/src/FsReveal/FsReveal.fsproj
@@ -2,37 +2,34 @@
- Debug
+ ReleaseAnyCPU2.07e90d6ce-a10b-4858-a5bc-41df7250cbcaLibraryFsRevealFsReveal
- v4.5
- 4.3.0.0
+ v4.6.1FsReveal
-
- ..\..\truefullfalse
- false
- ..\..\bin
+ true
+ bin\DebugDEBUG;TRACE3
- ..\..\bin\FsReveal.xml
+ bin\Debug\FsReveal.xmlpdbonlytruetrue
- ..\..\bin
+ bin\ReleaseTRACE3
- ..\..\bin\FsReveal.xml
+ bin\Release\FsReveal.xml11
@@ -50,14 +47,11 @@
-
+
+ True
+ paket-files/Facade.fs
+
@@ -67,7 +61,10 @@
- Always
+ IfNewer
+
+
+ IfNewer
@@ -82,16 +79,7 @@
-
-
-
- ..\..\packages\FSharp.Compiler.Service\lib\net40\FSharp.Compiler.Service.dll
- True
- True
-
-
-
-
+ ..\..\packages\FSharp.Compiler.Service\lib\net45\FSharp.Compiler.Service.dll
@@ -102,64 +90,10 @@
-
-
-
- ..\..\packages\FSharp.Core\lib\net20\FSharp.Core.dll
- True
- True
-
-
-
-
-
-
- ..\..\packages\FSharp.Core\lib\portable-net45+netcore45\FSharp.Core.dll
- True
- True
-
-
-
-
-
-
- ..\..\packages\FSharp.Core\lib\net40\FSharp.Core.dll
- True
- True
-
-
-
-
+
- ..\..\packages\FSharp.Core\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core.dll
- True
- True
-
-
-
-
-
-
- ..\..\packages\FSharp.Core\lib\portable-net45+sl5+netcore45\FSharp.Core.dll
- True
- True
-
-
-
-
-
-
- ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wp8\FSharp.Core.dll
- True
- True
-
-
-
-
-
-
- ..\..\packages\FSharp.Core\lib\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll
+ ..\..\packages\FSharp.Core\lib\net45\FSharp.Core.dllTrueTrue
@@ -167,7 +101,7 @@
-
+ ..\..\packages\FSharp.Formatting\lib\net40\CSharpFormat.dll
@@ -213,7 +147,7 @@
-
+ ..\..\packages\FSharpVSPowerTools.Core\lib\net45\FSharpVSPowerTools.Core.dll
@@ -223,4 +157,15 @@
+
+
+
+
+ ..\..\packages\System.ValueTuple\lib\netstandard1.0\System.ValueTuple.dll
+ True
+ True
+
+
+
+
\ No newline at end of file
diff --git a/src/FsReveal/fonts.css b/src/FsReveal/fonts.css
new file mode 100644
index 00000000..d338a752
--- /dev/null
+++ b/src/FsReveal/fonts.css
@@ -0,0 +1,144 @@
+/* This stylesheet generated by Transfonter (http://transfonter.org) on November 9, 2016 4:16 PM */
+
+@font-face {
+ font-family: 'Droid Sans';
+ src: url('./fonts/DroidSans.eot');
+ src: url('./fonts/DroidSans.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/DroidSans.woff2') format('woff2'),
+ url('./fonts/DroidSans.woff') format('woff'),
+ url('./fonts/DroidSans.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Droid Sans';
+ src: url('./fonts/DroidSans-Bold.eot');
+ src: url('./fonts/DroidSans-Bold.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/DroidSans-Bold.woff2') format('woff2'),
+ url('./fonts/DroidSans-Bold.woff') format('woff'),
+ url('./fonts/DroidSans-Bold.ttf') format('truetype');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Droid Sans Mono';
+ src: url('./fonts/DroidSansMono.eot');
+ src: url('./fonts/DroidSansMono.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/DroidSansMono.woff2') format('woff2'),
+ url('./fonts/DroidSansMono.woff') format('woff'),
+ url('./fonts/DroidSansMono.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-Extrabold.eot');
+ src: url('./fonts/OpenSans-Extrabold.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-Extrabold.woff2') format('woff2'),
+ url('./fonts/OpenSans-Extrabold.woff') format('woff'),
+ url('./fonts/OpenSans-Extrabold.ttf') format('truetype');
+ font-weight: 800;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-SemiboldItalic.eot');
+ src: url('./fonts/OpenSans-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-SemiboldItalic.woff2') format('woff2'),
+ url('./fonts/OpenSans-SemiboldItalic.woff') format('woff'),
+ url('./fonts/OpenSans-SemiboldItalic.ttf') format('truetype');
+ font-weight: 600;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSansLight-Italic.eot');
+ src: url('./fonts/OpenSansLight-Italic.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSansLight-Italic.woff2') format('woff2'),
+ url('./fonts/OpenSansLight-Italic.woff') format('woff'),
+ url('./fonts/OpenSansLight-Italic.ttf') format('truetype');
+ font-weight: 300;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-Light.eot');
+ src: url('./fonts/OpenSans-Light.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-Light.woff2') format('woff2'),
+ url('./fonts/OpenSans-Light.woff') format('woff'),
+ url('./fonts/OpenSans-Light.ttf') format('truetype');
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-BoldItalic.eot');
+ src: url('./fonts/OpenSans-BoldItalic.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-BoldItalic.woff2') format('woff2'),
+ url('./fonts/OpenSans-BoldItalic.woff') format('woff'),
+ url('./fonts/OpenSans-BoldItalic.ttf') format('truetype');
+ font-weight: bold;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-Bold.eot');
+ src: url('./fonts/OpenSans-Bold.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-Bold.woff2') format('woff2'),
+ url('./fonts/OpenSans-Bold.woff') format('woff'),
+ url('./fonts/OpenSans-Bold.ttf') format('truetype');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-ExtraboldItalic.eot');
+ src: url('./fonts/OpenSans-ExtraboldItalic.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-ExtraboldItalic.woff2') format('woff2'),
+ url('./fonts/OpenSans-ExtraboldItalic.woff') format('woff'),
+ url('./fonts/OpenSans-ExtraboldItalic.ttf') format('truetype');
+ font-weight: 800;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-Italic.eot');
+ src: url('./fonts/OpenSans-Italic.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-Italic.woff2') format('woff2'),
+ url('./fonts/OpenSans-Italic.woff') format('woff'),
+ url('./fonts/OpenSans-Italic.ttf') format('truetype');
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans.eot');
+ src: url('./fonts/OpenSans.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans.woff2') format('woff2'),
+ url('./fonts/OpenSans.woff') format('woff'),
+ url('./fonts/OpenSans.ttf') format('truetype');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Open Sans';
+ src: url('./fonts/OpenSans-Semibold.eot');
+ src: url('./fonts/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),
+ url('./fonts/OpenSans-Semibold.woff2') format('woff2'),
+ url('./fonts/OpenSans-Semibold.woff') format('woff'),
+ url('./fonts/OpenSans-Semibold.ttf') format('truetype');
+ font-weight: 600;
+ font-style: normal;
+}
diff --git a/src/FsReveal/fonts/DroidSans-Bold.eot b/src/FsReveal/fonts/DroidSans-Bold.eot
new file mode 100644
index 00000000..346a620d
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans-Bold.eot differ
diff --git a/src/FsReveal/fonts/DroidSans-Bold.ttf b/src/FsReveal/fonts/DroidSans-Bold.ttf
new file mode 100644
index 00000000..e9a939b0
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans-Bold.ttf differ
diff --git a/src/FsReveal/fonts/DroidSans-Bold.woff b/src/FsReveal/fonts/DroidSans-Bold.woff
new file mode 100644
index 00000000..b72675d2
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans-Bold.woff differ
diff --git a/src/FsReveal/fonts/DroidSans-Bold.woff2 b/src/FsReveal/fonts/DroidSans-Bold.woff2
new file mode 100644
index 00000000..7f16dce7
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans-Bold.woff2 differ
diff --git a/src/FsReveal/fonts/DroidSans.eot b/src/FsReveal/fonts/DroidSans.eot
new file mode 100644
index 00000000..027edda3
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans.eot differ
diff --git a/src/FsReveal/fonts/DroidSans.ttf b/src/FsReveal/fonts/DroidSans.ttf
new file mode 100644
index 00000000..c785b482
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans.ttf differ
diff --git a/src/FsReveal/fonts/DroidSans.woff b/src/FsReveal/fonts/DroidSans.woff
new file mode 100644
index 00000000..6cab43f6
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans.woff differ
diff --git a/src/FsReveal/fonts/DroidSans.woff2 b/src/FsReveal/fonts/DroidSans.woff2
new file mode 100644
index 00000000..507b6ab2
Binary files /dev/null and b/src/FsReveal/fonts/DroidSans.woff2 differ
diff --git a/src/FsReveal/fonts/DroidSansMono.eot b/src/FsReveal/fonts/DroidSansMono.eot
new file mode 100644
index 00000000..83743d0e
Binary files /dev/null and b/src/FsReveal/fonts/DroidSansMono.eot differ
diff --git a/src/FsReveal/fonts/DroidSansMono.ttf b/src/FsReveal/fonts/DroidSansMono.ttf
new file mode 100644
index 00000000..1e5c3325
Binary files /dev/null and b/src/FsReveal/fonts/DroidSansMono.ttf differ
diff --git a/src/FsReveal/fonts/DroidSansMono.woff b/src/FsReveal/fonts/DroidSansMono.woff
new file mode 100644
index 00000000..89ffc77c
Binary files /dev/null and b/src/FsReveal/fonts/DroidSansMono.woff differ
diff --git a/src/FsReveal/fonts/DroidSansMono.woff2 b/src/FsReveal/fonts/DroidSansMono.woff2
new file mode 100644
index 00000000..67185e4b
Binary files /dev/null and b/src/FsReveal/fonts/DroidSansMono.woff2 differ
diff --git a/src/FsReveal/fonts/LICENSE.txt b/src/FsReveal/fonts/LICENSE.txt
new file mode 100755
index 00000000..d6456956
--- /dev/null
+++ b/src/FsReveal/fonts/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/src/FsReveal/fonts/OpenSans-Bold.eot b/src/FsReveal/fonts/OpenSans-Bold.eot
new file mode 100644
index 00000000..999dc25c
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Bold.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-Bold.ttf b/src/FsReveal/fonts/OpenSans-Bold.ttf
new file mode 100644
index 00000000..8540b204
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Bold.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Bold.woff b/src/FsReveal/fonts/OpenSans-Bold.woff
new file mode 100644
index 00000000..fa3a403e
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Bold.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-Bold.woff2 b/src/FsReveal/fonts/OpenSans-Bold.woff2
new file mode 100644
index 00000000..7f69aa45
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Bold.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-BoldItalic.eot b/src/FsReveal/fonts/OpenSans-BoldItalic.eot
new file mode 100644
index 00000000..1ca19c7b
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-BoldItalic.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-BoldItalic.ttf b/src/FsReveal/fonts/OpenSans-BoldItalic.ttf
new file mode 100644
index 00000000..0f7d9aaf
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-BoldItalic.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-BoldItalic.woff b/src/FsReveal/fonts/OpenSans-BoldItalic.woff
new file mode 100644
index 00000000..ce246035
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-BoldItalic.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-BoldItalic.woff2 b/src/FsReveal/fonts/OpenSans-BoldItalic.woff2
new file mode 100644
index 00000000..27b4e321
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-BoldItalic.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-Extrabold.eot b/src/FsReveal/fonts/OpenSans-Extrabold.eot
new file mode 100644
index 00000000..89fb6eb1
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Extrabold.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-Extrabold.ttf b/src/FsReveal/fonts/OpenSans-Extrabold.ttf
new file mode 100644
index 00000000..934fcc26
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Extrabold.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Extrabold.woff b/src/FsReveal/fonts/OpenSans-Extrabold.woff
new file mode 100644
index 00000000..73f87c2e
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Extrabold.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-Extrabold.woff2 b/src/FsReveal/fonts/OpenSans-Extrabold.woff2
new file mode 100644
index 00000000..a53b0050
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Extrabold.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-ExtraboldItalic.eot b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.eot
new file mode 100644
index 00000000..945ef5c4
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-ExtraboldItalic.ttf b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.ttf
new file mode 100644
index 00000000..d805c800
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-ExtraboldItalic.woff b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.woff
new file mode 100644
index 00000000..b8c3c15f
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-ExtraboldItalic.woff2 b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.woff2
new file mode 100644
index 00000000..1a575853
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-ExtraboldItalic.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-Italic.eot b/src/FsReveal/fonts/OpenSans-Italic.eot
new file mode 100644
index 00000000..25bf15a3
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Italic.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-Italic.ttf b/src/FsReveal/fonts/OpenSans-Italic.ttf
new file mode 100644
index 00000000..bcf94f4f
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Italic.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Italic.woff b/src/FsReveal/fonts/OpenSans-Italic.woff
new file mode 100644
index 00000000..3dd3c5e5
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Italic.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-Italic.woff2 b/src/FsReveal/fonts/OpenSans-Italic.woff2
new file mode 100644
index 00000000..79a26670
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Italic.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-Light.eot b/src/FsReveal/fonts/OpenSans-Light.eot
new file mode 100644
index 00000000..10a8377a
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Light.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-Light.ttf b/src/FsReveal/fonts/OpenSans-Light.ttf
new file mode 100644
index 00000000..3b21c3ca
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Light.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Light.woff b/src/FsReveal/fonts/OpenSans-Light.woff
new file mode 100644
index 00000000..cecd791f
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Light.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-Light.woff2 b/src/FsReveal/fonts/OpenSans-Light.woff2
new file mode 100644
index 00000000..bbe79f23
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Light.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-LightItalic.ttf b/src/FsReveal/fonts/OpenSans-LightItalic.ttf
new file mode 100755
index 00000000..68299c4b
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-LightItalic.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Regular.ttf b/src/FsReveal/fonts/OpenSans-Regular.ttf
new file mode 100755
index 00000000..db433349
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Regular.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Semibold.eot b/src/FsReveal/fonts/OpenSans-Semibold.eot
new file mode 100644
index 00000000..3f248799
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Semibold.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-Semibold.ttf b/src/FsReveal/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 00000000..d66a071a
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Semibold.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-Semibold.woff b/src/FsReveal/fonts/OpenSans-Semibold.woff
new file mode 100644
index 00000000..b3e997b0
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Semibold.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-Semibold.woff2 b/src/FsReveal/fonts/OpenSans-Semibold.woff2
new file mode 100644
index 00000000..df98b0e3
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-Semibold.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans-SemiboldItalic.eot b/src/FsReveal/fonts/OpenSans-SemiboldItalic.eot
new file mode 100644
index 00000000..897100a4
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-SemiboldItalic.eot differ
diff --git a/src/FsReveal/fonts/OpenSans-SemiboldItalic.ttf b/src/FsReveal/fonts/OpenSans-SemiboldItalic.ttf
new file mode 100644
index 00000000..2303a356
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-SemiboldItalic.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans-SemiboldItalic.woff b/src/FsReveal/fonts/OpenSans-SemiboldItalic.woff
new file mode 100644
index 00000000..529f9fd9
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-SemiboldItalic.woff differ
diff --git a/src/FsReveal/fonts/OpenSans-SemiboldItalic.woff2 b/src/FsReveal/fonts/OpenSans-SemiboldItalic.woff2
new file mode 100644
index 00000000..bcb90fe6
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans-SemiboldItalic.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSans.eot b/src/FsReveal/fonts/OpenSans.eot
new file mode 100644
index 00000000..3c585c51
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans.eot differ
diff --git a/src/FsReveal/fonts/OpenSans.ttf b/src/FsReveal/fonts/OpenSans.ttf
new file mode 100644
index 00000000..7a4e22a8
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans.ttf differ
diff --git a/src/FsReveal/fonts/OpenSans.woff b/src/FsReveal/fonts/OpenSans.woff
new file mode 100644
index 00000000..101c1897
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans.woff differ
diff --git a/src/FsReveal/fonts/OpenSans.woff2 b/src/FsReveal/fonts/OpenSans.woff2
new file mode 100644
index 00000000..cb388731
Binary files /dev/null and b/src/FsReveal/fonts/OpenSans.woff2 differ
diff --git a/src/FsReveal/fonts/OpenSansLight-Italic.eot b/src/FsReveal/fonts/OpenSansLight-Italic.eot
new file mode 100644
index 00000000..0c002640
Binary files /dev/null and b/src/FsReveal/fonts/OpenSansLight-Italic.eot differ
diff --git a/src/FsReveal/fonts/OpenSansLight-Italic.ttf b/src/FsReveal/fonts/OpenSansLight-Italic.ttf
new file mode 100644
index 00000000..63463063
Binary files /dev/null and b/src/FsReveal/fonts/OpenSansLight-Italic.ttf differ
diff --git a/src/FsReveal/fonts/OpenSansLight-Italic.woff b/src/FsReveal/fonts/OpenSansLight-Italic.woff
new file mode 100644
index 00000000..4dcf0d51
Binary files /dev/null and b/src/FsReveal/fonts/OpenSansLight-Italic.woff differ
diff --git a/src/FsReveal/fonts/OpenSansLight-Italic.woff2 b/src/FsReveal/fonts/OpenSansLight-Italic.woff2
new file mode 100644
index 00000000..8bf83bb1
Binary files /dev/null and b/src/FsReveal/fonts/OpenSansLight-Italic.woff2 differ
diff --git a/src/FsReveal/fsreveal.fsx b/src/FsReveal/fsreveal.fsx
index 9afaf6e0..158d7d31 100644
--- a/src/FsReveal/fsreveal.fsx
+++ b/src/FsReveal/fsreveal.fsx
@@ -1,16 +1,18 @@
#load "../../FSharp.Formatting/FSharp.Formatting.fsx"
-#I "../lib/net40"
+#I "../lib/net461" // this fils is in ./tools in the nuget package
#r "FsReveal.dll"
+open System.IO
// Workaround for https://github.com/fsharp/FSharp.Compiler.Service/issues/199
// (The file needs to be in the same place from which FSharp.Compiler.Service.dll is loaded)
-printfn "copy FSharp.Compiler.Interactive.Settings ..."
+printfn "copy FSharp.Compiler.Interactive.Settings ..."
let targetFCIS = __SOURCE_DIRECTORY__ + "/../../FAKE/tools/FSharp.Compiler.Interactive.Settings.dll"
-if not (System.IO.File.Exists(targetFCIS)) then
- System.IO.File.Copy(__SOURCE_DIRECTORY__ + "/../lib/net40/FSharp.Compiler.Interactive.Settings.dll", targetFCIS)
-FsReveal.FsRevealHelper.RevealJsFolder <- System.IO.Path.Combine(__SOURCE_DIRECTORY__,"../reveal.js")
-printfn "Set FsReveal folder to %s" FsReveal.FsRevealHelper.RevealJsFolder
+if not (File.Exists (targetFCIS)) then
+ System.IO.File.Copy(__SOURCE_DIRECTORY__ + "/../lib/net461/FSharp.Compiler.Interactive.Settings.dll", targetFCIS)
-FsReveal.FsRevealHelper.TemplateFile <- System.IO.Path.Combine(__SOURCE_DIRECTORY__,"template.html")
+FsReveal.FsRevealHelper.DistFolder <- System.IO.Path.Combine(__SOURCE_DIRECTORY__)
+printfn "Set dist to %s" FsReveal.FsRevealHelper.DistFolder
+
+FsReveal.FsRevealHelper.TemplateFile <- System.IO.Path.Combine(__SOURCE_DIRECTORY__,"index.html")
FsReveal.FsRevealHelper.StyleFile <- System.IO.Path.Combine(__SOURCE_DIRECTORY__,"fsreveal.css")
\ No newline at end of file
diff --git a/src/FsReveal/manifest.json b/src/FsReveal/manifest.json
new file mode 100644
index 00000000..32795285
--- /dev/null
+++ b/src/FsReveal/manifest.json
@@ -0,0 +1,8 @@
+
+{
+ "name": "FsReveal presentation",
+ "start_url": "index.html",
+ "display": "standalone",
+ "orientation": "portrait",
+ "background_color": "#FFFFFF"
+}
\ No newline at end of file
diff --git a/src/FsReveal/paket.references b/src/FsReveal/paket.references
index 3a1b7bfc..def6c23b 100644
--- a/src/FsReveal/paket.references
+++ b/src/FsReveal/paket.references
@@ -1,2 +1,3 @@
FSharp.Formatting
-FSharp.Core
\ No newline at end of file
+FSharp.Core
+File: Facade.fs
diff --git a/src/FsReveal/template.html b/src/FsReveal/template.html
index 26dc7d60..511a82c9 100644
--- a/src/FsReveal/template.html
+++ b/src/FsReveal/template.html
@@ -1,6 +1,6 @@
-
+
-
+
{title}
@@ -8,82 +8,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+