global anchors, reflink (#855)

* global anchors, reflink * reverting a few minor changes
tlienart · Jul 27, 2021 · 4ba6d90 · 4ba6d90 · tlienart · Jul 27, 2021
1 parent 83455fe
commit 4ba6d90
Show file tree

Hide file tree

Showing 5 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.43"
+version = "0.10.44"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

diff --git a/src/converter/latex/hyperrefs.jl b/src/converter/latex/hyperrefs.jl
@@ -72,9 +72,18 @@ lx_citep(lxc::LxCom, _) = form_href(lxc, "BIBR"; class="bibref")
 
 function lx_label(lxc::LxCom, _)
     refs = content(lxc.braces[1]) |> strip |> refstring
+    # note: this overwrites a previous label if there was one already
+    GLOBAL_VARS["anchors"].first[refs] = url_curpage()
     return "<a id=\"$refs\" class=\"anchor\"></a>"
 end
 
+@delay function lx_reflink(lxc::LxCom, _)
+    refs = content(lxc.braces[1]) |> strip |> refstring
+    anchors = globvar(:anchors)
+    refs in keys(anchors) || return "#"
+    return "$(anchors[refs])#$refs"
+end
+
 function lx_biblabel(lxc::LxCom, _)::String
     name = refstring(stent(lxc.braces[1]))
     PAGE_BIBREFS[name] = content(lxc.braces[2])

diff --git a/src/converter/latex/objects.jl b/src/converter/latex/objects.jl
@@ -15,6 +15,7 @@ const LX_INTERNAL_COMMANDS = [
     lxd("label",    1), # \label{id}
     lxd("biblabel", 2), # \biblabel{id}{name}
     lxd("toc",      0), # \toc
+    lxd("reflink",  1), # \reflink{id}
     # -------------------
     # inclusion / outputs (see converter/latex/io.jl)
     lxd("input",      2), # \input{what}{rpath}

diff --git a/src/converter/markdown/blocks.jl b/src/converter/markdown/blocks.jl
@@ -133,6 +133,8 @@ function convert_header(β::OCBlock, lxdefs::Vector{LxDef})::String
     else
         PAGE_HEADERS[rstitle] = (title, 1, parse(Int, hk[2]))
     end
+    # make the header anchor globally available
+    GLOBAL_VARS["anchors"].first[rstitle] = url_curpage()
     # return the title
     if globvar(:title_links)::Bool
         return html_hk(hk,

diff --git a/src/utils/vars.jl b/src/utils/vars.jl
@@ -58,6 +58,8 @@ const GLOBAL_VARS_DEFAULT = [
     "fd_page_tags"     => Pair(nothing, (DTAG,  Nothing)),
     "fd_tag_pages"     => Pair(nothing, (DTAGI, Nothing)),
     "fd_rss_feed_url"  => dpair(""),
+    # keep track of all anchors {label => page} in case of clash, there's no guarantee
+    "anchors"          => dpair(LittleDict{String,String}()),
     # -----------------------------------------------------
     # LEGACY
     "div_content" => dpair(""), # see build_page