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

Moved smiliey format to config hash table.

Browse source
This commit is contained in:
Dominik Picheta 2014-12-04 18:47:01 +00:00
commit 898501d9d1
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,6 @@ type
seenIndexTerms: Table[string, int] ## \ seenIndexTerms: Table[string, int] ## \
## Keeps count of same text index terms to generate different identifiers ## Keeps count of same text index terms to generate different identifiers
## for hyperlinks. See renderIndexTerm proc for details. ## for hyperlinks. See renderIndexTerm proc for details.
smileyFrmt: string ## How to massage the smiley filename.
PDoc = var TRstGenerator ## Alias to type less. PDoc = var TRstGenerator ## Alias to type less.
@ -81,8 +80,7 @@ proc initRstGenerator*(g: var TRstGenerator, target: TOutputTarget,
config: StringTableRef, filename: string, config: StringTableRef, filename: string,
options: TRstParseOptions, options: TRstParseOptions,
findFile: TFindFileHandler=nil, findFile: TFindFileHandler=nil,
msgHandler: TMsgHandler=nil, msgHandler: TMsgHandler=nil) =
smileyFrmt = "/images/smilies/$1.gif") =
## Initializes a ``TRstGenerator``. ## Initializes a ``TRstGenerator``.
## ##
## You need to call this before using a ``TRstGenerator`` with any other ## You need to call this before using a ``TRstGenerator`` with any other
@ -142,7 +140,6 @@ proc initRstGenerator*(g: var TRstGenerator, target: TOutputTarget,
let s = config["split.item.toc"] let s = config["split.item.toc"]
if s != "": g.splitAfter = parseInt(s) if s != "": g.splitAfter = parseInt(s)
for i in low(g.meta)..high(g.meta): g.meta[i] = "" for i in low(g.meta)..high(g.meta): g.meta[i] = ""
g.smileyFrmt = smileyFrmt
proc writeIndexFile*(g: var TRstGenerator, outfile: string) = proc writeIndexFile*(g: var TRstGenerator, outfile: string) =
## Writes the current index buffer to the specified output file. ## Writes the current index buffer to the specified output file.
@ -778,7 +775,7 @@ proc renderSmiley(d: PDoc, n: PRstNode, result: var string) =
dispA(d.target, result, dispA(d.target, result,
"""<img src="$1" width="15" """<img src="$1" width="15"
height="17" hspace="2" vspace="2" class="smiley" />""", height="17" hspace="2" vspace="2" class="smiley" />""",
"\\includegraphics{$1}", [d.smileyFrmt % n.text]) "\\includegraphics{$1}", [d.config["doc.smiley_format"] % n.text])
proc parseCodeBlockField(d: PDoc, n: PRstNode, params: var CodeBlockParams) = proc parseCodeBlockField(d: PDoc, n: PRstNode, params: var CodeBlockParams) =
## Parses useful fields which can appear before a code block. ## Parses useful fields which can appear before a code block.
@ -1204,6 +1201,7 @@ $content
""") """)
setConfigVar("doc.body_no_toc", "$moduledesc $content") setConfigVar("doc.body_no_toc", "$moduledesc $content")
setConfigVar("doc.file", "$content") setConfigVar("doc.file", "$content")
setConfigVar("doc.smiley_format", "/images/smilies/$1.gif")
# ---------- forum --------------------------------------------------------- # ---------- forum ---------------------------------------------------------