fix fsprojects#695

dsyme · Jul 29, 2021 · 0d81d37 · 0d81d37
1 parent 14e78e6
commit 0d81d37
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 84 deletions.
diff --git a/docs/README.txt b/docs/README.txt
@@ -4,30 +4,6 @@
 
 The `Dockerfile` and `NuGet.config` allow us to run generated notebooks in [MyBinder](https://mybinder.org)
 
-* `gh-pages` branch of dsyme/DiffSharp:  [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/dsyme/DiffSharp/gh-pages)
-
-* `index.ipynb` for `dev` branch of dsyme/DiffSharp: [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/dsyme/DiffSharp/gh-pages?filepath=index.ipynb)
-
-# Generating docs
-
-This published version of the docs can be refreshed by these commands:
-
-1. Prepare one off
-
-    dotnet tool restore
-    git clone https://github.com/dsyme/DiffSharp ../DiffSharp-docs -b gh-pages --depth 1
-
-2. Build
-
-    dotnet build
-    dotnet fsdocs build --clean --output ../DiffSharp-docs
-    bash -c "(cd ../DiffSharp-docs && git add . && git commit -a -m doc-update && git push -f https://github.com/dsyme/DiffSharp gh-pages)"
-
-To use a local builg of FSharp.Formatting:
-
-       git clone https://github.com/fsprojects/FSharp.Formatting  ../FSharp.Formatting
-       cd ..\FSharp.Formatting
-       .\build
 
 # How it works
 

diff --git a/docs/_template.fsx b/docs/_template.fsx
@@ -1 +0,0 @@
-

diff --git a/docs/apidocs.fsx b/docs/apidocs.fsx
@@ -26,7 +26,7 @@ index: 5
 let root = "C:\\"
 
 (**
-[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/diffsharp/diffsharp.github.io/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
+[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
 [![Script](img/badge-script.svg)]({{root}}/{{fsdocs-source-basename}}.fsx)&emsp;
 [![Notebook](img/badge-notebook.svg)]({{root}}/{{fsdocs-source-basename}}.ipynb)
 

diff --git a/docs/codeformat.fsx b/docs/codeformat.fsx
@@ -22,7 +22,7 @@ index: 1
 #endif // IPYNB
 
 (**
-[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/diffsharp/diffsharp.github.io/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
+[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
 [![Script](img/badge-script.svg)]({{root}}/{{fsdocs-source-basename}}.fsx)&emsp;
 [![Notebook](img/badge-notebook.svg)]({{root}}/{{fsdocs-source-basename}}.ipynb)
 

diff --git a/docs/content.fsx b/docs/content.fsx
@@ -23,7 +23,7 @@ index: 3
 
 
 (**
-[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/diffsharp/diffsharp.github.io/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
+[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
 [![Script](img/badge-script.svg)]({{root}}/{{fsdocs-source-basename}}.fsx)&emsp;
 [![Notebook](img/badge-notebook.svg)]({{root}}/{{fsdocs-source-basename}}.ipynb)
 

diff --git a/docs/evaluation.fsx b/docs/evaluation.fsx
@@ -22,7 +22,7 @@ index: 6
 #endif // IPYNB
 
 (**
-[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/diffsharp/diffsharp.github.io/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
+[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
 [![Script](img/badge-script.svg)]({{root}}/{{fsdocs-source-basename}}.fsx)&emsp;
 [![Notebook](img/badge-notebook.svg)]({{root}}/{{fsdocs-source-basename}}.ipynb)
 

diff --git a/docs/literate.fsx b/docs/literate.fsx
@@ -23,7 +23,7 @@ index: 3
 
 
 (**
-[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/diffsharp/diffsharp.github.io/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
+[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
 [![Script](img/badge-script.svg)]({{root}}/{{fsdocs-source-basename}}.fsx)&emsp;
 [![Notebook](img/badge-notebook.svg)]({{root}}/{{fsdocs-source-basename}}.ipynb)
 

diff --git a/docs/markdown.fsx b/docs/markdown.fsx
@@ -20,7 +20,7 @@ index: 2
 
 
 (**
-[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/diffsharp/diffsharp.github.io/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
+[![Binder](img/badge-binder.svg)](https://mybinder.org/v2/gh/fsprojects/fsharp.formatting/master?filepath={{fsdocs-source-basename}}.ipynb)&emsp;
 [![Script](img/badge-script.svg)]({{root}}/{{fsdocs-source-basename}}.fsx)&emsp;
 [![Notebook](img/badge-notebook.svg)]({{root}}/{{fsdocs-source-basename}}.ipynb)
 

diff --git a/docs/sidebyside/sidemarkdown.md b/docs/sidebyside/sidemarkdown.md
@@ -56,7 +56,6 @@ code and get correct tool tips:
 
     let answer = Hidden.answer
 
-
 ## Including other snippets
 
 When writing literate programs as Markdown documents, 
@@ -68,4 +67,6 @@ code samples:
     Console.WriteLine("Hello world!");
 
 This snippet is turned into a `pre` element with the
-`lang` attribute set to `csharp`.
+`lang` attribute set to `csharp`.
+
+<br />
diff --git a/src/FSharp.Formatting.Common/Templating.fs b/src/FSharp.Formatting.Common/Templating.fs
@@ -165,8 +165,8 @@ module internal SimpleTemplating =
         sb.ToString()
 
     // Replace '{{xyz}}' in text
-    let ApplySubstitutions (substitutions: seq<ParamKey * string>) templateTextOpt =
-        match templateTextOpt with
+    let ApplySubstitutions (substitutions: seq<ParamKey * string>) (templateTextOpt: string option) =
+        match templateTextOpt |> Option.map (fun s -> s.Trim()) with
         | None | Some "" ->
             // If there is no template or the template is an empty file, return just document + tooltips (tooltips empty if not HTML)
             let lookup = readOnlyDict substitutions