From b7284cbee9d48f851273c46ff771274c5cc5596f Mon Sep 17 00:00:00 2001
From: tlienart <tlienart@me.com>
Date: Fri, 21 May 2021 10:44:51 +0200
Subject: [PATCH] parsing of +++ block on windows

---
 Project.toml                  |  2 +-
 src/parser/markdown/tokens.jl |  2 +-
 test/converter/md/md_defs2.jl | 11 +++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Project.toml b/Project.toml
index 77896e707..c79b44b54 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "Franklin"
 uuid = "713c75ef-9fc9-4b05-94a9-213340da978e"
 authors = ["Thibaut Lienart <tlienart@me.com>"]
-version = "0.10.36"
+version = "0.10.37"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
diff --git a/src/parser/markdown/tokens.jl b/src/parser/markdown/tokens.jl
index de5576043..00b9bf5bb 100644
--- a/src/parser/markdown/tokens.jl
+++ b/src/parser/markdown/tokens.jl
@@ -32,7 +32,7 @@ that works will be taken.
 const MD_TOKENS = LittleDict{Char, Vector{TokenFinder}}(
     '<'  => [ isexactly("<!--")  => :COMMENT_OPEN,     # <!-- ...
              ],
-    '+'  => [ isexactly("+++", ('\n',)) => :MD_DEF_TOML,
+    '+'  => [ isexactly("+++", ('\n','\r')) => :MD_DEF_TOML,
              ],
     '-'  => [ isexactly("-->")   => :COMMENT_CLOSE,    #  ... -->
               incrlook(is_hr1)   => :HORIZONTAL_RULE,  # ---+
diff --git a/test/converter/md/md_defs2.jl b/test/converter/md/md_defs2.jl
index 54260c92c..1ada8598d 100644
--- a/test/converter/md/md_defs2.jl
+++ b/test/converter/md/md_defs2.jl
@@ -96,3 +96,14 @@ end
         """ |> fd2html
     @test isapproxstr(s, "<p> 5 2013-09-04</p>")
 end
+
+# windows return
+@testset "mddefwindows" begin
+    s = "+++\r\na = \"hello\"\r\n+++\r\n# hi\r\n{{a}}" |> fd2html
+    @test isapproxstr(s,
+        """
+        <h1 id=\"hi\"><a href=\"#hi\" class=\"header-anchor\">hi</a></h1>
+        hello
+        """
+    )
+end