From 2a7cad7be50595b38484b40408ffb9059a56123e Mon Sep 17 00:00:00 2001 From: steve donovan Date: Tue, 14 Jun 2011 10:58:44 +0200 Subject: [PATCH] complete moving template and stylesheet to html --- ldoc.lua | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ldoc.lua b/ldoc.lua index c0f7f59..522fe4d 100644 --- a/ldoc.lua +++ b/ldoc.lua @@ -262,7 +262,6 @@ function Lua:parse_extra (tags,tok,toks) local res local stat,t,v = pcall(tok) if not stat then return nil end - print('tok',t,v) res,t,v = self:search_for_token(tok,'{','{',tok()) if not res then return nil,t,v end 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 -local ldoc_dir = arg[0]:gsub('[^/\\]+$','') -if args.style == '!' then args.style = ldoc_dir end -if args.template == '!' then args.template = ldoc_dir end +local ldoc_html = path.join(arg[0]:gsub('[^/\\]+$',''),'html') +if args.style == '!' then args.style = ldoc_html end +if args.template == '!' then args.template = ldoc_html end local module_template,err = utils.readfile (path.join(args.template,templ)) if not module_template then quit(err) end - - if args.format ~= 'plain' then local ok,markup = pcall(require,args.format) if not ok then quit("cannot load formatter: "..args.format) end