From d636f1b008fa1dfc665b9eff2764002202631e13 Mon Sep 17 00:00:00 2001 From: garret Date: Fri, 17 Jun 2022 22:45:44 +0100 Subject: nuke old and bad config stuff This reverts commit 52f3a086f2ad7a3bbc9b8f8225a99e9e99120613. It also manually bandages over the places where it was ripped out. it was never a good idea in the first place --- macros/garret.restyler.lua | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'macros/garret.restyler.lua') diff --git a/macros/garret.restyler.lua b/macros/garret.restyler.lua index 1c5dc9f..043ee1e 100644 --- a/macros/garret.restyler.lua +++ b/macros/garret.restyler.lua @@ -5,22 +5,19 @@ script_version = "2.1.0" script_namespace = "garret.restyler" local haveDepCtrl, DependencyControl, depctrl = pcall(require, "l0.DependencyControl") -local simpleconf +local karaskel, cleantags if haveDepCtrl then depctrl = DependencyControl { --feed="TODO", - {"karaskel", "cleantags", {"garret.simpleconf", url="https://github.com/garret1317/aegisub-scripts"}, } + {"karaskel", "cleantags"} } - kara, clean, simpleconf = depctrl:requireModules() - config_dir = depctrl.configDir + kara, clean = depctrl:requireModules() else include("karaskel.lua") include("cleantags.lua") - simpleconf = require 'garret.simpleconf' - config_dir = "?user/config" end -local config = simpleconf.get_config(aegisub.decode_path(config_dir.."/"..script_namespace..".conf"), {new_style = "Default"}) +-- local config = simpleconf.get_config(aegisub.decode_path(config_dir.."/"..script_namespace..".conf"), {new_style = "Default"}) -- TODO: detect pre-existing inline tags -- probably need some kind of ass parsing, or a hack with match() @@ -52,7 +49,7 @@ end function main(sub, sel) local _, styles = karaskel.collect_head(sub, false) - --local config.new_style = "Default" -- the one we'll be changing stuff to - TODO: configurable + local config.new_style = "Default" local new_style = styles[config.new_style] for h, i in ipairs(sel) do -- TODO: automatically exclude styles (also configurable) -- cgit v1.2.3-70-g09d2