jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduces length of lines to remove compilation warnings.

Browse source
This commit is contained in:
Grzegorz Adam Hankiewicz 2014-04-21 20:33:08 +02:00
commit d31638a103
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/packages/docutils/rstgen.nim
View file

@ -619,6 +619,7 @@ proc mergeIndexes*(dir: string): string =
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
proc stripTOCHTML(s: string): string = proc stripTOCHTML(s: string): string =
## Ugly quick hack to remove HTML tags from TOC titles. ## Ugly quick hack to remove HTML tags from TOC titles.
## ##
@ -649,11 +650,9 @@ proc renderHeadline(d: PDoc, n: PRstNode, result: var string) =
d.tocPart[length].n = n d.tocPart[length].n = n
d.tocPart[length].header = tmp d.tocPart[length].header = tmp
dispA(d.target, result, dispA(d.target, result, "\n<h$1><a class=\"toc-backref\" " &
"\n<h$1><a class=\"toc-backref\" id=\"$2\" href=\"#$2_toc\">$3</a></h$1>", "id=\"$2\" href=\"#$2_toc\">$3</a></h$1>", "\\rsth$4{$3}\\label{$2}\n",
"\\rsth$4{$3}\\label{$2}\n", [$n.level, [$n.level, d.tocPart[length].refname, tmp, $chr(n.level - 1 + ord('A'))])
d.tocPart[length].refname, tmp,
$chr(n.level - 1 + ord('A'))])
else: else:
dispA(d.target, result, "\n<h$1 id=\"$2\">$3</h$1>", dispA(d.target, result, "\n<h$1 id=\"$2\">$3</h$1>",
"\\rsth$4{$3}\\label{$2}\n", [ "\\rsth$4{$3}\\label{$2}\n", [
@ -688,7 +687,8 @@ proc renderTocEntry(d: PDoc, e: TTocEntry, result: var string) =
"<li><a class=\"reference\" id=\"$1_toc\" href=\"#$1\">$2</a></li>\n", "<li><a class=\"reference\" id=\"$1_toc\" href=\"#$1\">$2</a></li>\n",
"\\item\\label{$1_toc} $2\\ref{$1}\n", [e.refname, e.header]) "\\item\\label{$1_toc} $2\\ref{$1}\n", [e.refname, e.header])
proc renderTocEntries*(d: var TRstGenerator, j: var int, lvl: int, result: var string) = proc renderTocEntries*(d: var TRstGenerator, j: var int, lvl: int,
result: var string) =
var tmp = "" var tmp = ""
while j <= high(d.tocPart): while j <= high(d.tocPart):
var a = abs(d.tocPart[j].n.level) var a = abs(d.tocPart[j].n.level)
@ -832,7 +832,8 @@ proc renderRstToOut(d: PDoc, n: PRstNode, result: var string) =
[tmp]) [tmp])
of rnField: renderField(d, n, result) of rnField: renderField(d, n, result)
of rnFieldName: of rnFieldName:
renderAux(d, n, "<th class=\"docinfo-name\">$1:</th>", "\\item[$1:]", result) renderAux(d, n, "<th class=\"docinfo-name\">$1:</th>",
"\\item[$1:]", result)
of rnFieldBody: of rnFieldBody:
renderAux(d, n, "<td>$1</td>", " $1\n", result) renderAux(d, n, "<td>$1</td>", " $1\n", result)
of rnIndex: of rnIndex:
@ -891,7 +892,8 @@ proc renderRstToOut(d: PDoc, n: PRstNode, result: var string) =
of rnRef: of rnRef:
var tmp = "" var tmp = ""
renderAux(d, n, tmp) renderAux(d, n, tmp)
dispA(d.target, result, "<a class=\"reference external\" href=\"#$2\">$1</a>", dispA(d.target, result,
"<a class=\"reference external\" href=\"#$2\">$1</a>",
"$1\\ref{$2}", [tmp, rstnodeToRefname(n)]) "$1\\ref{$2}", [tmp, rstnodeToRefname(n)])
of rnStandaloneHyperlink: of rnStandaloneHyperlink:
renderAux(d, n, renderAux(d, n,
@ -902,9 +904,9 @@ proc renderRstToOut(d: PDoc, n: PRstNode, result: var string) =
var tmp1 = "" var tmp1 = ""
renderRstToOut(d, n.sons[0], tmp0) renderRstToOut(d, n.sons[0], tmp0)
renderRstToOut(d, n.sons[1], tmp1) renderRstToOut(d, n.sons[1], tmp1)
dispA(d.target, result, "<a class=\"reference external\" href=\"$2\">$1</a>", dispA(d.target, result,
"\\href{$2}{$1}", "<a class=\"reference external\" href=\"$2\">$1</a>",
[tmp0, tmp1]) "\\href{$2}{$1}", [tmp0, tmp1])
of rnDirArg, rnRaw: renderAux(d, n, result) of rnDirArg, rnRaw: renderAux(d, n, result)
of rnRawHtml: of rnRawHtml:
if d.target != outLatex: if d.target != outLatex: