diff --git a/build/cyan/cli.lua b/build/cyan/cli.lua index a0b9958..f65d0c3 100644 --- a/build/cyan/cli.lua +++ b/build/cyan/cli.lua @@ -5,7 +5,6 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th local argparse = require("argparse") local tl = require("tl") - local command = require("cyan.command") local common = require("cyan.tlcommon") local config = require("cyan.config") diff --git a/build/cyan/commands/build.lua b/build/cyan/commands/build.lua index 204a4e5..a69217d 100644 --- a/build/cyan/commands/build.lua +++ b/build/cyan/commands/build.lua @@ -6,8 +6,7 @@ local tl = require("tl") local command = require("cyan.command") local common = require("cyan.tlcommon") local config = require("cyan.config") - -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local fs = require("cyan.fs") local graph = require("cyan.graph") local log = require("cyan.log") diff --git a/build/cyan/commands/check-gen.lua b/build/cyan/commands/check-gen.lua index 32748ab..cc827b8 100644 --- a/build/cyan/commands/check-gen.lua +++ b/build/cyan/commands/check-gen.lua @@ -8,7 +8,7 @@ local argparse = require("argparse") local config = require("cyan.config") local common = require("cyan.tlcommon") local command = require("cyan.command") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local log = require("cyan.log") local fs = require("cyan.fs") local util = require("cyan.util") diff --git a/build/cyan/commands/initialize.lua b/build/cyan/commands/initialize.lua index 8b46955..12e999a 100644 --- a/build/cyan/commands/initialize.lua +++ b/build/cyan/commands/initialize.lua @@ -6,7 +6,7 @@ local argparse = require("argparse") local command = require("cyan.command") local config = require("cyan.config") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local fs = require("cyan.fs") local log = require("cyan.log") local util = require("cyan.util") diff --git a/build/cyan/commands/warnings.lua b/build/cyan/commands/warnings.lua index 808aa3a..9730a47 100644 --- a/build/cyan/commands/warnings.lua +++ b/build/cyan/commands/warnings.lua @@ -5,7 +5,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th local command = require("cyan.command") local config = require("cyan.config") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local log = require("cyan.log") local tl = require("tl") local util = require("cyan.util") diff --git a/build/cyan/experimental/decoration.lua b/build/cyan/decoration.lua similarity index 100% rename from build/cyan/experimental/decoration.lua rename to build/cyan/decoration.lua diff --git a/build/cyan/interaction.lua b/build/cyan/interaction.lua index 0cbda86..fcb77dd 100644 --- a/build/cyan/interaction.lua +++ b/build/cyan/interaction.lua @@ -3,7 +3,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th local log = require("cyan.log") local util = require("cyan.util") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local ivalues = util.tab.ivalues diff --git a/build/cyan/log.lua b/build/cyan/log.lua index 0bb7d5a..04c4d37 100644 --- a/build/cyan/log.lua +++ b/build/cyan/log.lua @@ -38,7 +38,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th local system = require("system") local util = require("cyan.util") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local str = util.str local no_color_env = os.getenv("NO_COLOR") ~= nil diff --git a/build/cyan/script.lua b/build/cyan/script.lua index 8eaad0f..bb456f1 100644 --- a/build/cyan/script.lua +++ b/build/cyan/script.lua @@ -5,7 +5,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th local tl = require("tl") local command = require("cyan.command") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local fs = require("cyan.fs") local log = require("cyan.log") local sandbox = require("cyan.sandbox") diff --git a/build/cyan/tlcommon.lua b/build/cyan/tlcommon.lua index 1eaff27..899df61 100644 --- a/build/cyan/tlcommon.lua +++ b/build/cyan/tlcommon.lua @@ -4,7 +4,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th local config = require("cyan.config") -local decoration = require("cyan.experimental.decoration") +local decoration = require("cyan.decoration") local fs = require("cyan.fs") local log = require("cyan.log") local util = require("cyan.util") diff --git a/cyan-dev-1.rockspec b/cyan-dev-1.rockspec index b1dacea..afa80b3 100644 --- a/cyan-dev-1.rockspec +++ b/cyan-dev-1.rockspec @@ -28,7 +28,7 @@ build = { ["cyan.commands.run"] = "build/cyan/commands/run.lua", ["cyan.commands.warnings"] = "build/cyan/commands/warnings.lua", ["cyan.config"] = "build/cyan/config.lua", - ["cyan.experimental.decoration"] = "build/cyan/experimental/decoration.lua", + ["cyan.decoration"] = "build/cyan/decoration.lua", ["cyan.fs.init"] = "build/cyan/fs/init.lua", ["cyan.fs.path"] = "build/cyan/fs/path.lua", ["cyan.graph"] = "build/cyan/graph.lua", @@ -50,7 +50,7 @@ build = { ["cyan.commands.run"] = "src/cyan/commands/run.tl", ["cyan.commands.warnings"] = "src/cyan/commands/warnings.tl", ["cyan.config"] = "src/cyan/config.tl", - ["cyan.experimental.decoration"] = "src/cyan/experimental/decoration.tl", + ["cyan.decoration"] = "src/cyan/decoration.tl", ["cyan.fs.init"] = "src/cyan/fs/init.tl", ["cyan.fs.path"] = "src/cyan/fs/path.tl", ["cyan.graph"] = "src/cyan/graph.tl", diff --git a/docs/index.html b/docs/index.html index 14d9da3..6d2f97c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -114,7 +114,7 @@
cyan.experimental.decoration +
cyan.decoration
Color
Decorated:copy
Decorated
@@ -168,7 +168,7 @@
cyan.graph
Dag:find
Dag:insert_file
Dag:mark_each
@@ -179,7 +179,7 @@
cyan.interaction
interaction.yes_no_prompt
cyan.log @@ -196,9 +196,9 @@
cyan.script
script.disable
@@ -316,7 +316,7 @@
type Config
function config.load
function
config.load(): Config
, {string}
, {string}
Try to load tlconfig.lua
in the current directory
A replacement for colorstring that doesn't specifically rely on ANSI terminal escapes
type Color
diff --git a/scripts/gen_documentation.tl b/scripts/gen_documentation.tl
index 15d7c52..2f30e22 100644
--- a/scripts/gen_documentation.tl
+++ b/scripts/gen_documentation.tl
@@ -1,4 +1,4 @@
-local decoration