diff options
| author | Araq <rumpf_a@web.de> | 2018-08-05 14:17:24 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2018-08-05 14:17:24 +0200 |
| commit | 7ac6462cbd30bcdb1c3805fbb06be13b3346ce2a (patch) | |
| tree | 2e79c210ccd19a7065b36992e19ab74ff061f5df /compiler/docgen.nim | |
| parent | 282c4f3d0a72fbb4c49df51048e2e13fafcd8659 (diff) | |
| parent | 74842ed4a981b6ff168d67d05ee92dce350549cb (diff) | |
| download | Nim-7ac6462cbd30bcdb1c3805fbb06be13b3346ce2a.tar.gz | |
make at least bootstrapping work
Diffstat (limited to 'compiler/docgen.nim')
| -rw-r--r-- | compiler/docgen.nim | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 75b599ae9..8d233566c 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -259,7 +259,7 @@ proc nodeToHighlightedHtml(d: PDoc; n: PNode; result: var Rope; renderFlags: TRe of tkSpaces, tkInvalid: add(result, literal) of tkCurlyDotLe: - dispA(d.conf, result, "<span>" & # This span is required for the JS to work properly + dispA(d.conf, result, "<span>" & # This span is required for the JS to work properly """<span class="Other">{</span><span class="Other pragmadots">...</span><span class="Other">}</span> </span> <span class="pragmawrap"> @@ -517,12 +517,11 @@ proc genItem(d: PDoc, n, nameNode: PNode, k: TSymKind) = path = path[cwd.len+1 .. ^1].replace('\\', '/') let gitUrl = getConfigVar(d.conf, "git.url") if gitUrl.len > 0: - var commit = getConfigVar(d.conf, "git.commit") - if commit.len == 0: commit = "master" + let commit = getConfigVar(d.conf, "git.commit", "master") + let develBranch = getConfigVar(d.conf, "git.devel", "devel") dispA(d.conf, seeSrcRope, "$1", "", [ropeFormatNamedVars(d.conf, docItemSeeSrc, - ["path", "line", "url", "commit"], [rope path, - rope($n.info.line), rope gitUrl, - rope commit])]) + ["path", "line", "url", "commit", "devel"], [rope path, + rope($n.info.line), rope gitUrl, rope commit, rope develBranch])]) add(d.section[k], ropeFormatNamedVars(d.conf, getConfigVar(d.conf, "doc.item"), ["name", "header", "desc", "itemID", "header_plain", "itemSym", |