Merge branch 'master' of github.com:stevedonovan/LDoc

This commit is contained in:
steve donovan 2013-04-17 12:08:44 +02:00
commit 5beb1f048a
5 changed files with 17 additions and 9 deletions

View File

@ -1,7 +1,7 @@
project='LDoc' project='LDoc'
title='LDoc documentation' title='LDoc documentation'
description='A Lua documentation tool' description='A Lua documentation tool'
format='discount' format='discount'
file='ldoc.lua' file='ldoc.lua'
dir='out' dir='out'
readme='docs/doc.md' readme='doc/doc.md'

7
doc/config.ld Normal file
View File

@ -0,0 +1,7 @@
project='LDoc'
title='LDoc documentation'
description='A Lua documentation tool'
format='discount'
file='../ldoc.lua'
dir='../out'
readme='doc.md'

View File

@ -35,7 +35,7 @@ app.require_here()
--- @usage --- @usage
local usage = [[ local usage = [[
ldoc, a documentation generator for Lua, vs 1.3.10 ldoc, a documentation generator for Lua, vs 1.3.11
-d,--dir (default docs) output directory -d,--dir (default docs) output directory
-o,--output (default 'index') output name -o,--output (default 'index') output name
-v,--verbose verbose -v,--verbose verbose
@ -301,6 +301,7 @@ end
if type(source_dir) == 'string' and path.isfile(source_dir) then if type(source_dir) == 'string' and path.isfile(source_dir) then
source_dir = path.splitpath(source_dir) source_dir = path.splitpath(source_dir)
end end
source_dir = source_dir:gsub('[/\\]%.$','')
---------- specifying the package for inferring module names -------- ---------- specifying the package for inferring module names --------
-- If you use module(...), or forget to explicitly use @module, then -- If you use module(...), or forget to explicitly use @module, then

View File

@ -249,7 +249,7 @@ return [==[
</div> <!-- id="content" --> </div> <!-- id="content" -->
</div> <!-- id="main" --> </div> <!-- id="main" -->
<div id="about"> <div id="about">
<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.3</a></i> <i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.3.11</a></i>
</div> <!-- id="about" --> </div> <!-- id="about" -->
</div> <!-- id="container" --> </div> <!-- id="container" -->
</body> </body>