From 42429e694cbf2370e5bc41ae6972a6d358ef94b1 Mon Sep 17 00:00:00 2001 From: steve donovan Date: Sat, 13 Apr 2013 15:44:27 +0200 Subject: [PATCH 1/2] file={'.'} in config.d caused module name failure; docs->doc --- config.ld | 14 +++++++------- doc/config.ld | 7 +++++++ {docs => doc}/doc.md | 0 ldoc.lua | 1 + 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 doc/config.ld rename {docs => doc}/doc.md (100%) diff --git a/config.ld b/config.ld index 4fb78c9..796e3cf 100644 --- a/config.ld +++ b/config.ld @@ -1,7 +1,7 @@ -project='LDoc' -title='LDoc documentation' -description='A Lua documentation tool' -format='discount' -file='ldoc.lua' -dir='out' -readme='docs/doc.md' +project='LDoc' +title='LDoc documentation' +description='A Lua documentation tool' +format='discount' +file='ldoc.lua' +dir='out' +readme='doc/doc.md' diff --git a/doc/config.ld b/doc/config.ld new file mode 100644 index 0000000..aacd86a --- /dev/null +++ b/doc/config.ld @@ -0,0 +1,7 @@ +project='LDoc' +title='LDoc documentation' +description='A Lua documentation tool' +format='discount' +file='../ldoc.lua' +dir='../out' +readme='doc.md' diff --git a/docs/doc.md b/doc/doc.md similarity index 100% rename from docs/doc.md rename to doc/doc.md diff --git a/ldoc.lua b/ldoc.lua index ae5c8aa..12dd533 100644 --- a/ldoc.lua +++ b/ldoc.lua @@ -301,6 +301,7 @@ end if type(source_dir) == 'string' and path.isfile(source_dir) then source_dir = path.splitpath(source_dir) end +source_dir = source_dir:gsub('[/\\]%.$','') ---------- specifying the package for inferring module names -------- -- If you use module(...), or forget to explicitly use @module, then From 97af82c53d5f0e353ceae7207df643d8b3cb2825 Mon Sep 17 00:00:00 2001 From: steve donovan Date: Sat, 13 Apr 2013 16:15:54 +0200 Subject: [PATCH 2/2] bumped to 1.3.11 --- ldoc.lua | 2 +- ldoc/html/ldoc_ltp.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ldoc.lua b/ldoc.lua index 12dd533..77a2809 100644 --- a/ldoc.lua +++ b/ldoc.lua @@ -35,7 +35,7 @@ app.require_here() --- @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 -o,--output (default 'index') output name -v,--verbose verbose diff --git a/ldoc/html/ldoc_ltp.lua b/ldoc/html/ldoc_ltp.lua index ddbcd36..74ce34d 100644 --- a/ldoc/html/ldoc_ltp.lua +++ b/ldoc/html/ldoc_ltp.lua @@ -249,7 +249,7 @@ return [==[
-generated by LDoc 1.3 +generated by LDoc 1.3.11