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

complete moving template and stylesheet to html

This commit is contained in:
steve donovan 2011-06-14 10:58:44 +02:00
parent e62bec5b81
commit 2a7cad7be5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ldoc.lua
View File

@ -262,7 +262,6 @@ function Lua:parse_extra (tags,tok,toks)
local res local res
local stat,t,v = pcall(tok) local stat,t,v = pcall(tok)
if not stat then return nil end if not stat then return nil end
print('tok',t,v)
res,t,v = self:search_for_token(tok,'{','{',tok()) res,t,v = self:search_for_token(tok,'{','{',tok())
if not res then return nil,t,v end if not res then return nil,t,v end
tags.formal_args = tools.get_parameters(toks,'}',function(s) tags.formal_args = tools.get_parameters(toks,'}',function(s)
@ -618,15 +617,13 @@ args.ext = '.'..args.ext
-- '!' here means 'use same directory as ldoc.lua -- '!' here means 'use same directory as ldoc.lua
local ldoc_dir = arg[0]:gsub('[^/\\]+$','') local ldoc_html = path.join(arg[0]:gsub('[^/\\]+$',''),'html')
if args.style == '!' then args.style = ldoc_dir end if args.style == '!' then args.style = ldoc_html end
if args.template == '!' then args.template = ldoc_dir end if args.template == '!' then args.template = ldoc_html end
local module_template,err = utils.readfile (path.join(args.template,templ)) local module_template,err = utils.readfile (path.join(args.template,templ))
if not module_template then quit(err) end if not module_template then quit(err) end
if args.format ~= 'plain' then if args.format ~= 'plain' then
local ok,markup = pcall(require,args.format) local ok,markup = pcall(require,args.format)
if not ok then quit("cannot load formatter: "..args.format) end if not ok then quit("cannot load formatter: "..args.format) end