diff options
| -rw-r--r-- | config/nimdoc.cfg | 14 | ||||
| -rw-r--r-- | doc/basicopt.txt | 5 | ||||
| -rw-r--r-- | doc/gc.txt | 8 | ||||
| -rw-r--r-- | doc/nimc.txt | 6 | ||||
| -rw-r--r-- | tools/nimweb.nim | 16 |
5 files changed, 33 insertions, 16 deletions
diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg index 464c506c4..3abae7388 100644 --- a/config/nimdoc.cfg +++ b/config/nimdoc.cfg @@ -130,7 +130,7 @@ html { -ms-text-size-adjust: 100%; } /* Where we want fancier font if available */ -h1, h2, h3, h4, h5, h6, p.module-desc, blockquote p { +h1, h2, h3, h4, h5, h6, p.module-desc, table.docinfo + blockquote p, table.docinfo blockquote p, h1 + blockquote p { font-family: "Raleway", "Helvetica Neue", "HelveticaNeue", Helvetica, Arial, sans-serif !important; } h1.title { @@ -523,9 +523,13 @@ abbr.initialism { blockquote { padding: 0 0 0 15px; margin: 0 0 20px; - border-left: 5px solid #c9c9c9; } + border-left: 5px solid #EFEBE0; } -blockquote p { +table.docinfo + blockquote, table.docinfo blockquote, h1 + blockquote { + border-left: 5px solid #c9c9c9; +} + +table.docinfo + blockquote p, table.docinfo blockquote p, h1 + blockquote p { margin-bottom: 0; font-size: 15px; font-weight: 200; @@ -605,6 +609,10 @@ table { border-collapse: collapse; border-spacing: 0; } +table th, table td { + padding: 0px 8px 0px; +} + .table { width: 100%; margin-bottom: 20px; } diff --git a/doc/basicopt.txt b/doc/basicopt.txt index e8aaa2e4c..ffb374f18 100644 --- a/doc/basicopt.txt +++ b/doc/basicopt.txt @@ -1,5 +1,6 @@ -Usage:: - nim command [options] [projectfile] [arguments] +:: + + nim command [options] [projectfile] [arguments] Command: //compile, c compile project with default code generator (C) diff --git a/doc/gc.txt b/doc/gc.txt index d6e228558..ac8d46cfa 100644 --- a/doc/gc.txt +++ b/doc/gc.txt @@ -2,11 +2,15 @@ Nim's Garbage Collector ========================== -:Author: Andreas Rumpf -:Version: |nimversion| +:Author: Andreas Rumpf +:Version: |nimversion| + +.. + "The road to hell is paved with good intentions." + Introduction ============ diff --git a/doc/nimc.txt b/doc/nimc.txt index 1f2675df8..92acd3979 100644 --- a/doc/nimc.txt +++ b/doc/nimc.txt @@ -28,10 +28,14 @@ Compiler Usage Command line switches --------------------- -Basic command line switches are: +Basic command line switches are: + +Usage: .. include:: basicopt.txt +---- + Advanced command line switches are: .. include:: advopt.txt diff --git a/tools/nimweb.nim b/tools/nimweb.nim index d56b6aecf..74f561b52 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -268,18 +268,18 @@ proc buildDoc(c: var TConfigData, destPath: string) = commands = newSeq[string](len(c.doc) + len(c.srcdoc) + len(c.srcdoc2)) i = 0 for d in items(c.doc): - commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(d).dir, + commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(d).name, "html"), d] i.inc for d in items(c.srcdoc): - commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(d).dir, + commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(d).name, "html"), d] i.inc for d in items(c.srcdoc2): - commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(d).dir, + commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(d).name, "html"), d] i.inc @@ -311,8 +311,8 @@ proc buildAddDoc(c: var TConfigData, destPath: string) = # build additional documentation (without the index): var commands = newSeq[string](c.webdoc.len) for i, doc in pairs(c.webdoc): - commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(doc).dir, + commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(doc).name, "html"), doc] mexec(commands, c.numProcessors) |