Aire-One
/
LDoc2tl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #136 from hishamhm/master 

Give command-line flags priority over the config file (plus minor fixes)
This commit is contained in:
Steve J Donovan 2013-12-21 00:15:30 -08:00
parent c93c14709f 8b48e1d256
commit bbc3183e35
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ldoc-scm-2.rockspec
View File

@ -33,10 +33,12 @@ build = {
["ldoc.lexer"] = "ldoc/lexer.lua",
["ldoc.markup"] = "ldoc/markup.lua",
["ldoc.prettify"] = "ldoc/prettify.lua",
["ldoc.markdown"] = "ldoc/markdown.lua",
["ldoc.doc"] = "ldoc/doc.lua",
["ldoc.html.ldoc_css"] = "ldoc/html/ldoc_css.lua",
["ldoc.html.ldoc_ltp"] = "ldoc/html/ldoc_ltp.lua",
["ldoc.html.ldoc_one_css"] = "ldoc/html/ldoc_one_css.lua",
["ldoc.html.ldoc_pale_css"] = "ldoc/html/ldoc_pale_css.lua",
["ldoc.builtin.globals"] = "ldoc/builtin/globals.lua",
["ldoc.builtin.coroutine"] = "ldoc/builtin/coroutine.lua",
["ldoc.builtin.global"] = "ldoc/builtin/global.lua",

2
ldoc.lua
View File

@ -135,7 +135,7 @@ local add_language_extension
doc.ldoc = ldoc
local function override (field)
if ldoc[field] ~= nil then args[field] = ldoc[field] end
if args[field] == nil and ldoc[field] ~= nil then args[field] = ldoc[field] end
end
-- aliases to existing tags can be defined. E.g. just 'p' for 'param'

2
ldoc/markup.lua
View File

@ -23,7 +23,7 @@ local function resolve_inline_references (ldoc, txt, item, plain)
local ref,err = markup.process_reference(qname)
if not ref then
err = err .. ' ' .. qname
if item then item:warning(err)
if item and item.warning then item:warning(err)
else
io.stderr:write('nofile error: ',err,'\n')
end