diff options
| author | Araq <rumpf_a@web.de> | 2016-01-18 10:55:23 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-01-18 10:55:23 +0100 |
| commit | 55c1f3d30ce5d2ab8745ab2b98a38a605c690a54 (patch) | |
| tree | d729e8c0d7c929208c84450ad4a449e3eb32491e /compiler/docgen.nim | |
| parent | 68cbb4d2b4bc408e13fc27e6d054e3a0bb98bfb4 (diff) | |
| parent | 2309975f782bf59b240e3874d5c31b4b299eca5d (diff) | |
| download | Nim-55c1f3d30ce5d2ab8745ab2b98a38a605c690a54.tar.gz | |
Merge branch 'devel' of https://github.com/nim-lang/Nim into devel
Diffstat (limited to 'compiler/docgen.nim')
| -rw-r--r-- | compiler/docgen.nim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 8536cc619..8555ec4f0 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -149,10 +149,10 @@ proc ropeFormatNamedVars(frmt: FormatStr, varnames: openArray[string], proc genComment(d: PDoc, n: PNode): string = result = "" var dummyHasToc: bool - if n.comment != nil and startsWith(n.comment, "##"): + if n.comment != nil: renderRstToOut(d[], parseRst(n.comment, toFilename(n.info), toLinenumber(n.info), toColumn(n.info), - dummyHasToc, d.options + {roSkipPounds}), result) + dummyHasToc, d.options), result) proc genRecComment(d: PDoc, n: PNode): Rope = if n == nil: return nil @@ -537,7 +537,7 @@ proc generateJson(d: PDoc, n: PNode, jArray: JsonNode = nil): JsonNode = proc genSection(d: PDoc, kind: TSymKind) = const sectionNames: array[skModule..skTemplate, string] = [ "Imports", "Types", "Vars", "Lets", "Consts", "Vars", "Procs", "Methods", - "Iterators", "Iterators", "Converters", "Macros", "Templates" + "Iterators", "Converters", "Macros", "Templates" ] if d.section[kind] == nil: return var title = sectionNames[kind].rope |