bug fix for fd_page_html

tlienart · Sep 22, 2021 · 5a2840e · 5a2840e · tlienart · Sep 22, 2021
1 parent 098d7ec
commit 5a2840e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Franklin"
 uuid = "713c75ef-9fc9-4b05-94a9-213340da978e"
 authors = ["Thibaut Lienart <[email protected]>"]
-version = "0.10.56"
+version = "0.10.57"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/converter/markdown/md.jl b/src/converter/markdown/md.jl
@@ -173,6 +173,20 @@ function convert_md(
         title = first(values(PAGE_HEADERS))[1]
         set_var!(LOCAL_VARS, "title", title)
     end
+
+    # need to fill in fd_full_url and fd_page_html as in write_page which
+    # isn't called in the pagevar branch. This needs to happen before the
+    # ALL_PAGE_VARS copy which is what `pagevar` will query later on.
+    if pagevar
+        full_url = joinpath(
+            locvar(:website_url)::String,
+            strip(locvar(:fd_url)::String, '/')
+        )
+        set_var!(LOCAL_VARS, "fd_full_url", full_url)
+        ctt = convert_html(hstring)
+        set_var!(LOCAL_VARS, "fd_page_html", ctt)
+    end
+
     # Copy vars to allpagevars to make them more easily accessible to other pages
     if !(isrecursive || isinternal)
         ALL_PAGE_VARS[rpath] = deepcopy(LOCAL_VARS)