Skip to content

Commit

Permalink
1.4.3 release patches
Browse files Browse the repository at this point in the history
  • Loading branch information
stevedonovan committed Nov 3, 2014
1 parent 25fd0b6 commit 4ab5f07
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 7 deletions.
2 changes: 1 addition & 1 deletion doc/doc.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ For instance, it is not so married to the idea that Lua modules should be define
Otherwise, the output is very similar, which is no accident since the HTML templates are
based directly on LuaDoc. You can ship your own customized templates and style sheets with
your [own project](http://nilnor.github.com/textui/docs/) (also see Graham Hannington's
documentation for [Lua for z/OS](lua4z.com/doc/)). LDoc comes with three extra themes; 'pale'
documentation for [Lua for z/OS](http://lua4z.com/doc/)). LDoc comes with three extra themes; 'pale'
for those who like whitespace, 'one' for one-column output, and 'fixed' for a fixed navigation
bar down the left side.

Expand Down
64 changes: 64 additions & 0 deletions ldoc-1.4.3-1.rockspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package = "ldoc"
version = "1.4.3-1"

source = {
dir = "ldoc",
url = "http://mysite.mweb.co.za/residents/sdonovan/ldoc-1.4.3.zip"
}

description = {
summary = "A Lua Documentation Tool",
detailed = [[
LDoc is a LuaDoc-compatible documentation generator which can also
process C extension source. Markdown may be optionally used to
render comments, as well as integrated readme documentation and
pretty-printed example files
]],
homepage='http://stevedonovan.github.com/ldoc',
maintainer='[email protected]',
license = "MIT/X11",
}

dependencies = {
"penlight","markdown"
}

build = {
type = "builtin",
modules = {
["ldoc.tools"] = "ldoc/tools.lua",
["ldoc.lang"] = "ldoc/lang.lua",
["ldoc.parse"] = "ldoc/parse.lua",
["ldoc.html"] = "ldoc/html.lua",
["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_ltp"] = "ldoc/html/ldoc_ltp.lua",
["ldoc.html.ldoc_md_ltp"] = "ldoc/html/ldoc_md_ltp.lua",
["ldoc.html.ldoc_css"] = "ldoc/html/ldoc_css.lua",
["ldoc.html.ldoc_one_css"] = "ldoc/html/ldoc_one_css.lua",
["ldoc.html.ldoc_pale_css"] = "ldoc/html/ldoc_pale_css.lua",
["ldoc.html.ldoc_fixed_css"] = "ldoc/html/ldoc_fixed_css.lua",
["ldoc.builtin.globals"] = "ldoc/builtin/globals.lua",
["ldoc.builtin.coroutine"] = "ldoc/builtin/coroutine.lua",
["ldoc.builtin.global"] = "ldoc/builtin/global.lua",
["ldoc.builtin.debug"] = "ldoc/builtin/debug.lua",
["ldoc.builtin.io"] = "ldoc/builtin/io.lua",
["ldoc.builtin.lfs"] = "ldoc/builtin/lfs.lua",
["ldoc.builtin.lpeg"] = "ldoc/builtin/lpeg.lua",
["ldoc.builtin.math"] = "ldoc/builtin/math.lua",
["ldoc.builtin.os"] = "ldoc/builtin/os.lua",
["ldoc.builtin.package"] = "ldoc/builtin/package.lua",
["ldoc.builtin.string"] = "ldoc/builtin/string.lua",
["ldoc.builtin.table"] = "ldoc/builtin/table.lua",
},
copy_directories = {'doc','tests'},
install = {
bin = {
ldoc = "ldoc.lua"
}
}
}

12 changes: 6 additions & 6 deletions ldoc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
--
-- C/C++ support for Lua extensions is provided.
--
-- Available from LuaRocks as 'ldoc' and as a [Zip file](http://stevedonovan.github.com/files/ldoc-1.4.2.zip)
-- Available from LuaRocks as 'ldoc' and as a [Zip file](http://stevedonovan.github.com/files/ldoc-1.4.3.zip)
--
-- [Github Page](https://github.com/stevedonovan/ldoc)
--
Expand Down Expand Up @@ -464,8 +464,8 @@ end

if type(args.file) == 'table' then
-- this can only be set from config file so we can assume config is already read
process_all_files(args.file)
process_all_files(args.file)

elseif path.isdir(args.file) then
-- use any configuration file we find, if not already specified
if not config_dir then
Expand All @@ -480,9 +480,9 @@ elseif path.isdir(args.file) then
end
end
end

process_all_files({args.file})

elseif path.isfile(args.file) then
-- a single file may be accompanied by a config.ld in the same dir
if not config_dir then
Expand Down Expand Up @@ -528,7 +528,7 @@ local function add_special_project_entity (f,tags,process)
return item, F
end

local function prettify_source_files(files,class,linemap)
local function prettify_source_files(files,class,linemap)
local prettify = require 'ldoc.prettify'

process_file_list (files, '*.*', function(f)
Expand Down

0 comments on commit 4ab5f07

Please sign in to comment.