From 4ab5f07d846b8c8713957263ea3d1310946c5f5b Mon Sep 17 00:00:00 2001 From: steve donovan Date: Mon, 3 Nov 2014 18:50:29 +0200 Subject: [PATCH] 1.4.3 release patches --- doc/doc.md | 2 +- ldoc-1.4.3-1.rockspec | 64 +++++++++++++++++++++++++++++++++++++++++++ ldoc.lua | 12 ++++---- 3 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 ldoc-1.4.3-1.rockspec diff --git a/doc/doc.md b/doc/doc.md index 39f5e9e..f1aa206 100644 --- a/doc/doc.md +++ b/doc/doc.md @@ -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. diff --git a/ldoc-1.4.3-1.rockspec b/ldoc-1.4.3-1.rockspec new file mode 100644 index 0000000..26b0f64 --- /dev/null +++ b/ldoc-1.4.3-1.rockspec @@ -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='steve.j.donovan@gmail.com', + 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" + } + } +} + diff --git a/ldoc.lua b/ldoc.lua index e32472c..b6d57d9 100644 --- a/ldoc.lua +++ b/ldoc.lua @@ -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) -- @@ -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 @@ -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 @@ -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)