fsprojects · matthid · Apr 28, 2017 · Jun 19, 2016 · Jul 6, 2016 · Jul 6, 2016
diff --git a/FSharp.Formatting.sln b/FSharp.Formatting.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 12.0.31101.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194BD478-0DB5-44F3-A6C2-1FC75D3F3294}"
 	ProjectSection(SolutionItems) = preProject
@@ -74,6 +74,9 @@ EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Formatting.CommandTool", "src\FSharp.Formatting.CommandTool\FSharp.Formatting.CommandTool.fsproj", "{D30F7F2B-A4E3-4A07-A1BD-ED3EB21768F8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8D44B659-E9F7-4CE4-B5DA-D37CDDCD2525}"
+	ProjectSection(SolutionItems) = preProject
+		tests\commonmark_spec.json = tests\commonmark_spec.json
+	EndProjectSection
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.CodeFormat.Tests", "tests\FSharp.CodeFormat.Tests\FSharp.CodeFormat.Tests.fsproj", "{5DEBD769-D86E-4E14-ABF1-373CA91BFAA2}"
 EndProject
@@ -105,10 +108,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crefLib4", "tests\FSharp.Me
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Formatting.Common", "src\FSharp.Formatting.Common\FSharp.Formatting.Common.fsproj", "{91BAD90E-BF3B-4646-A1A7-1568F8F25075}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AFB9168D-4763-472D-B895-F61A049B75BF}"
-	ProjectSection(SolutionItems) = preProject
-		tests\commonmark_spec.json = tests\commonmark_spec.json
-	EndProjectSection
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Formatting.Razor", "src\FSharp.Formatting.Razor\FSharp.Formatting.Razor.fsproj", "{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -196,6 +196,10 @@ Global
 		{91BAD90E-BF3B-4646-A1A7-1568F8F25075}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91BAD90E-BF3B-4646-A1A7-1568F8F25075}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91BAD90E-BF3B-4646-A1A7-1568F8F25075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6B3C274-71A8-4239-BA9A-1AF7B2F7C736}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+## 3.0.0-beta01 (1 August, 2016)
+ - MarkdownSpan and MarkdownParagraph now use named DUs
+ - Add range to MarkdownParagraph and MarkdownSpan (#411)
+
 ## 2.14.4 (3 June, 2016)
  - Use `#I __SOURCE_DIRECTORY__` in the loads script (more reliable)
 

diff --git a/build.fsx b/build.fsx
@@ -47,7 +47,7 @@ let release = ReleaseNotesHelper.parseReleaseNotes (File.ReadLines "RELEASE_NOTE
 // Generate assembly info files with the right version & up-to-date information
 
 Target "AssemblyInfo" (fun _ ->
-  let info = 
+  let info =
       [ Attribute.Title project
         Attribute.Product project
         Attribute.Description summary
@@ -367,11 +367,11 @@ let bootStrapDocumentationFiles () =
     ensureDirectory (__SOURCE_DIRECTORY__ @@ "packages/FSharp.Formatting/lib/net40")
     let buildFiles = [ "CSharpFormat.dll"; "FSharp.CodeFormat.dll"; "FSharp.Literate.dll"
                        "FSharp.Markdown.dll"; "FSharp.MetadataFormat.dll"; "RazorEngine.dll";
-                       "System.Web.Razor.dll"; "FSharp.Formatting.Common.dll" ]
+                       "System.Web.Razor.dll"; "FSharp.Formatting.Common.dll"; "FSharp.Formatting.Razor.dll" ]
     let bundledFiles =
         buildFiles
-        |> List.map (fun f -> 
-            __SOURCE_DIRECTORY__ @@ sprintf "bin/%s" f, 
+        |> List.map (fun f ->
+            __SOURCE_DIRECTORY__ @@ sprintf "bin/%s" f,
             __SOURCE_DIRECTORY__ @@ sprintf "packages/FSharp.Formatting/lib/net40/%s" f)
         |> List.map (fun (source, dest) -> Path.GetFullPath source, Path.GetFullPath dest)
     for source, dest in bundledFiles do
@@ -384,7 +384,7 @@ Target "DogFoodCommandTool" (fun _ ->
     // generate metadata reference
     let dllFiles =
       [ "FSharp.CodeFormat.dll"; "FSharp.Formatting.Common.dll"
-        "FSharp.Literate.dll"; "FSharp.Markdown.dll"; "FSharp.MetadataFormat.dll" ]
+        "FSharp.Literate.dll"; "FSharp.Markdown.dll"; "FSharp.MetadataFormat.dll"; "FSharp.Formatting.Razor.dll" ]
         |> List.map (sprintf "bin/%s")
     let layoutRoots =
       [ "docs/tools"; "misc/templates"; "misc/templates/reference" ]
@@ -413,7 +413,7 @@ Target "DogFoodCommandTool" (fun _ ->
 Target "GenerateDocs" (fun _ ->
     bootStrapDocumentationFiles ()
     buildDocumentationTarget "--define:RELEASE --define:REFERENCE --define:HELP" "Default")
-      
+
 Target "WatchDocs" (fun _ ->
     bootStrapDocumentationFiles ()
     buildDocumentationTarget "--define:WATCH" "Default")

diff --git a/docs/content/codeformat.fsx b/docs/content/codeformat.fsx
@@ -23,8 +23,7 @@ entry point. The static method `CreateAgent` starts a background worker that
 can be called to format snippets repeatedly:
 *)
 
-let fsharpCompiler = Assembly.Load("FSharp.Compiler")
-let formattingAgent = CodeFormat.CreateAgent(fsharpCompiler)
+let formattingAgent = CodeFormat.CreateAgent()
 
 (**
 If you want to process multiple snippets, it is a good idea to keep the 

diff --git a/docs/content/evaluation.fsx b/docs/content/evaluation.fsx
@@ -78,10 +78,7 @@ Specifying the evaluator and formatting
 
 (*** hide ***)
 #nowarn "211"
-#I "../../bin"
-#r "FSharp.CodeFormat.dll"
-#r "FSharp.Literate.dll"
-#r "FSharp.Markdown.dll"
+#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx"
 (**
 The embedding of F# output requires specifying an additional parameter to the 
 parsing functions discussed in [literate programming documentation](literate.html).
@@ -159,9 +156,9 @@ fsiOl.RegisterTransformation(fun (o, ty) ->
     let items = 
       // Get items as objects and create paragraph for each item
       [ for it in Seq.cast<obj> (unbox o) -> 
-          [ Paragraph[Literal (it.ToString())] ] ]
+          [ Paragraph([Literal(it.ToString(), None)], None) ] ]
     // Return option value (success) with ordered list
-    Some [ ListBlock(MarkdownListKind.Ordered, items) ]
+    Some [ ListBlock(MarkdownListKind.Ordered, items, None) ]
   else None)
 (**
 

diff --git a/docs/content/literate.fsx b/docs/content/literate.fsx
@@ -110,18 +110,18 @@ Typical literate setup
 
 (*** hide ***)
 #nowarn "211"
-#I "../../bin"
 
 (**
 For literate programming support in your project, install the `FSharp.Formatting` nuget package.
 HTML (or LaTeX) is generated by including a simple script file similar to [`build.fsx`](https://github.com/tpetricek/FSharp.Formatting/blob/master/misc/literate/build.fsx) in your project.
 
-You can find this file in the installed nuget package folder: `/packages/FSharp.Formatting.2.8.0/literate/`
+You can find this file in the installed nuget package folder: `/packages/FSharp.Formatting/literate/`
 
-Assuming you are using *FSharp.Formatting 2.8.0* typical `build.fsx` looks like this:
+Assuming you are using [Paket](http://fsprojects.github.io/Paket/) to reference F# Formatting and you
+do not have version number in the directory name, typical `build.fsx` looks like this:
 *)
 
-#load @"../packages/FSharp.Formatting.2.8.0/FSharp.Formatting.fsx"
+#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx"
 open FSharp.Literate
 open System.IO
 

diff --git a/docs/content/markdown.fsx b/docs/content/markdown.fsx
@@ -9,8 +9,11 @@ how to turn the code into a nicely formatted HTML.
 First, we need to load the assembly and open necessary namespaces:
 *)
 
+#r "../../bin/FSharp.Formatting.Common.dll"
 #r "../../bin/FSharp.Markdown.dll"
 open FSharp.Markdown
+open FSharp.Formatting.Common
+
 
 (**
 Parsing documents
@@ -64,7 +67,7 @@ The following snippet prints the heading of the document:
 // Iterate over all the paragraph elements
 for par in parsed.Paragraphs do
   match par with
-  | Heading(1, [Literal text]) -> 
+  | Heading(size=1; body=[Literal(text=text)]) -> 
       // Recognize heading that has a simple content
       // containing just a literal (no other formatting)
       printfn "%s" text
@@ -92,12 +95,12 @@ to recognize any paragraph or span that can contain child elements:
 /// Returns all links in a specified span node
 let rec collectSpanLinks span = seq {
   match span with
-  | DirectLink(_, (url, _)) -> yield url
-  | IndirectLink(_, _, key) -> yield fst (parsed.DefinedLinks.[key])
+  | DirectLink(link=url) -> yield url
+  | IndirectLink(key=key) -> yield fst (parsed.DefinedLinks.[key])
   | Matching.SpanLeaf _ -> ()
   | Matching.SpanNode(_, spans) ->
       for s in spans do yield! collectSpanLinks s }
-
+      
 /// Returns all links in the specified paragraph node
 let rec collectParLinks par = seq {
   match par with

diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx
@@ -20,7 +20,7 @@ let info =
     "project-github", githubLink
     "project-nuget", "http://nuget.org/packages/FSharp.Formatting" ]
 
-let referenceBinaries = 
+let referenceBinaries =
   [ "FSharp.CodeFormat.dll"; "FSharp.Literate.dll"; "FSharp.Markdown.dll"; "FSharp.MetadataFormat.dll"; "FSharp.Formatting.Common.dll" ]
 
 // --------------------------------------------------------------------------------------
@@ -40,6 +40,7 @@ open Fake.FileHelper
 
 open FSharp.Literate
 open FSharp.MetadataFormat
+open FSharp.Formatting.Razor
 
 // When called from 'build.fsx', use the public project URL as <root>
 // otherwise, use the current 'output' directory.
@@ -56,7 +57,7 @@ let bin        = "../../bin"
 let content    = "../content"
 let output     = "../output"
 let files      = "../files"
-let templates  = "." 
+let templates  = "."
 let formatting = "../../misc/"
 let docTemplate = formatting @@ "templates/docpage.cshtml"
 let docTemplateSbS = templates @@ "docpage-sidebyside.cshtml"
@@ -80,7 +81,7 @@ let fsiEvaluator = lazy (Some (FsiEvaluator() :> IFsiEvaluator))
 let copyFiles () =
   CopyRecursive files output true |> Log "Copying file: "
   ensureDirectory (output @@ "content")
-  //CopyRecursive (formatting @@ "styles") (output @@ "content") true 
+  //CopyRecursive (formatting @@ "styles") (output @@ "content") true
   //  |> Log "Copying styles and scripts: "
 
 let binaries =
@@ -93,7 +94,7 @@ let libDirs = [bin]
 // Build API reference from XML comments
 let buildReference () =
   CleanDir (output @@ "reference")
-  MetadataFormat.Generate
+  RazorMetadataFormat.Generate
     ( binaries, output @@ "reference", layoutRootsAll.["en"],
       parameters = ("root", root)::info,
       sourceRepo = githubLink @@ "tree/master",
@@ -102,7 +103,7 @@ let buildReference () =
 
 // Build documentation from `fsx` and `md` files in `docs/content`
 let buildDocumentation () =
-  let subdirs = 
+  let subdirs =
     [ content @@ "sidebyside", docTemplateSbS
       content, docTemplate; ]
   for dir, template in subdirs do
@@ -115,7 +116,7 @@ let buildDocumentation () =
         match key with
         | Some lang -> layoutRootsAll.[lang]
         | None -> layoutRootsAll.["en"] // "en" is the default language
-    Literate.ProcessDirectory
+    RazorLiterate.ProcessDirectory
       ( dir, template, output @@ sub, replacements = ("root", root)::info,
         layoutRoots = layoutRoots,
         generateAnchors = true,
@@ -153,8 +154,7 @@ let watch () =
                 hasData := false
 
             printfn "Detected changes (%A). Invalidate cache and rebuild." !data
-            FSharp.MetadataFormat.RazorEngineCache.InvalidateCache (!data |> Seq.map (fun change -> change.FullPath))
-            FSharp.Literate.RazorEngineCache.InvalidateCache (!data |> Seq.map (fun change -> change.FullPath))
+            FSharp.Formatting.Razor.RazorEngineCache.InvalidateCache (!data |> Seq.map (fun change -> change.FullPath))
             rebuildDocs()
             printfn "Documentation generation finished."
         with e ->

diff --git a/misc/literate/build.fsx b/misc/literate/build.fsx
@@ -3,6 +3,7 @@
 #load "../../src/FSharp.Formatting.fsx"
 open System.IO
 open FSharp.Literate
+open FSharp.Formatting.Razor
 
 // ----------------------------------------------------------------------------
 // SETUP
@@ -30,26 +31,26 @@ let processScriptAsHtml () =
   let file = relative "demo.fsx"
   let output = relative "output/demo-script.html"
   let template = relative "templates/template-file.html"
-  Literate.ProcessScriptFile(file, template, output)
+  RazorLiterate.ProcessScriptFile(file, template, output)
 
 /// Processes a single F# Script file and produce LaTeX output
 let processScriptAsLatex () =
   let file = relative "demo.fsx"
   let output = relative "output/demo-script.tex"
   let template = relative "templates/template-color.tex"
-  Literate.ProcessScriptFile(file, template, output, format = OutputKind.Latex)
+  RazorLiterate.ProcessScriptFile(file, template, output, format = OutputKind.Latex)
 
 /// Processes a single Markdown document and produce HTML output
 let processDocAsHtml () =
   let file = relative "demo.md"
   let output = relative "output/demo-doc.html"
   let template = relative "templates/template-file.html"
-  Literate.ProcessMarkdown(file, template, output)
+  RazorLiterate.ProcessMarkdown(file, template, output)
 
 /// Processes a single Markdown document and produce LaTeX output
 let processDocAsLatex () =
   let file = relative "demo.md"
   let output = relative "output/demo-doc.tex"
   let template = relative "templates/template-color.tex"
-  Literate.ProcessMarkdown(file, template, output, format = OutputKind.Latex)
+  RazorLiterate.ProcessMarkdown(file, template, output, format = OutputKind.Latex)
 
diff --git a/packages/FSharp.Formatting/FSharp.Formatting.fsx b/packages/FSharp.Formatting/FSharp.Formatting.fsx
@@ -29,6 +29,7 @@ if (typeof<System.Web.Razor.ParserResults>.Assembly.GetName().Version.Major <= 2
 
 #r "FSharp.CodeFormat.dll"
 #r "FSharp.MetadataFormat.dll"
+#r "FSharp.Formatting.Razor.dll"
 
 // Setup Logging for FSharp.Formatting and Yaaf.FSharp.Scripting
 module Logging = FSharp.Formatting.Common.Log

diff --git a/paket.lock b/paket.lock
@@ -1,7 +1,6 @@
 REDIRECTS: ON
 NUGET
   remote: http://www.nuget.org/api/v2
-  specs:
     CommandLineParser (1.9.71)
     FAKE (4.22.8)
     FSharp.Compiler.Service (2.0.0.6)
@@ -21,5 +20,4 @@ NUGET
     Zlib.Portable (1.11) - framework: portable-net40+sl50+wp80+win80
 GITHUB
   remote: matthid/Yaaf.FSharp.Scripting
-  specs:
-    src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (48789eeb63382a6934966472e270e87880cb49ed)
+    src/source/Yaaf.FSharp.Scripting/YaafFSharpScripting.fs (48789eeb63382a6934966472e270e87880cb49ed)
diff --git a/src/Common/AssemblyInfo.cs b/src/Common/AssemblyInfo.cs
@@ -4,12 +4,12 @@
 [assembly: AssemblyTitleAttribute("FSharp.Formatting")]
 [assembly: AssemblyProductAttribute("FSharp.Formatting")]
 [assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")]
-[assembly: AssemblyVersionAttribute("2.14.3")]
-[assembly: AssemblyFileVersionAttribute("2.14.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.14.3")]
+[assembly: AssemblyVersionAttribute("3.0.0")]
+[assembly: AssemblyFileVersionAttribute("3.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("3.0.0-beta01")]
 [assembly: AssemblyCopyrightAttribute("Apache 2.0 License")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "2.14.3";
+        internal const string Version = "3.0.0";
     }
 }
diff --git a/src/Common/AssemblyInfo.fs b/src/Common/AssemblyInfo.fs
@@ -4,11 +4,11 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Formatting")>]
 [<assembly: AssemblyProductAttribute("FSharp.Formatting")>]
 [<assembly: AssemblyDescriptionAttribute("A package of libraries for building great F# documentation, samples and blogs")>]
-[<assembly: AssemblyVersionAttribute("2.14.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.14.3")>]
-[<assembly: AssemblyInformationalVersionAttribute("2.14.3")>]
+[<assembly: AssemblyVersionAttribute("3.0.0")>]
+[<assembly: AssemblyFileVersionAttribute("3.0.0")>]
+[<assembly: AssemblyInformationalVersionAttribute("3.0.0-beta01")>]
 [<assembly: AssemblyCopyrightAttribute("Apache 2.0 License")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.14.3"
+    let [<Literal>] Version = "3.0.0"