I768 (#769)

* ensuring prepath gets applied properly for redirect pages * closes #768
tlienart · Jan 24, 2021 · 7bc9f30 · tlienart · Jan 24, 2021 · 7bc9f30
1 parent 67a31f6
commit 7bc9f30
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
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.25"
+version = "0.10.26"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/converter/html/functions.jl b/src/converter/html/functions.jl
@@ -267,7 +267,7 @@ function hfun_redirect(params::Vector{String})::String
     <!doctype html>
     <html>
     <head>
-      <meta http-equiv="refresh" content="0; url=$(locvar(:fd_url))">
+      <meta http-equiv="refresh" content='0; url="$(locvar(:fd_url))"'>
     </head>
     </html>
     """)

diff --git a/src/converter/html/link_fixer.jl b/src/converter/html/link_fixer.jl
@@ -79,5 +79,5 @@ function fix_links(pg::String)::String
     pp = strip(prepath, '/')
     ss = SubstitutionString("\\1=\"/$(pp)/")
     # replace things that look like href="/..." with href="/$prepath/..."
-    return replace(pg, r"(src|href|formaction|url)\s*?=\s*?\"\/" => ss)
+    return replace(pg, r"(src|href|formaction|url)\s*?=\s*?\"?\/" => ss)
 end
diff --git a/src/manager/dir_utils.jl b/src/manager/dir_utils.jl
@@ -53,7 +53,7 @@ function _out_path(base::String)::String
 
        # add a closing separator to folder path
        rbase   = joinpath(path(:folder), "") * "_"
-       outpath = base[nextind(base, length(rbase)):end]
+       outpath = base[nextind(base, lastindex(rbase)):end]
        outpath = joinpath(path(:site), outpath)
    else
        # path is not a 'special folder'

diff --git a/test/integration/hfuns.jl b/test/integration/hfuns.jl
@@ -25,7 +25,7 @@
                     <!doctype html>
                     <html>
                     <head>
-                      <meta http-equiv="refresh" content="0; url=/foo/index.html">
+                      <meta http-equiv="refresh" content='0; url="/foo/index.html"'>
                     </head>
                     </html>"""
 end
diff --git a/test/utils/folder_structure.jl b/test/utils/folder_structure.jl
@@ -47,6 +47,11 @@ end
     out = F.form_output_path(base, file, :md)
     @test out == joinpath(F.PATHS[:site], "menu", "page", "index.html")
 
+    # issue 768
+    file = "pagéα.md"
+    out = F.form_output_path(base, file, :md)
+    @test out == joinpath(F.PATHS[:site], "menu", "pagéα", "index.html")
+
     # OTHER STUFF
     file = "foo.css"
     base = F.PATHS[:css]
-Original file line number
+Diff line change
@@ Expand Up / @@ -267,7 +267,7 @@ function hfun_redirect(params::Vector{String})::String @@
         <!doctype html>
         <html>
         <head>
-          <meta http-equiv="refresh" content="0; url=$(locvar(:fd_url))">
+          <meta http-equiv="refresh" content='0; url="$(locvar(:fd_url))"'>
         </head>
         </html>
         """)
@@ Expand Down @@