mirror of https://github.com/odrling/Aegisub
From changelog.txt:
- Automation: Added xor(a,b) boolean logical function to utils.lua (jfs) - Automation: Various changes to karaskel.lua and karaskel-adv.lua: (jfs) o Added some debug-calls (which are disable by default; aegisub.output_debug is replaced with a do-nothing function (you can change this in karaskel.lua) o The regular aegisub.output_debug is aliased to aegisub.output_warning, in order to always be able to show real warnings, in case something goes wrong o Fixed bug, triggered when a line had a style not defined in the subs. A warning is now shown instead. Originally committed to SVN as r4.
This commit is contained in:
parent
e125d13e3c
commit
e5df93eb51
|
@ -47,18 +47,22 @@ include("utils.lua")
|
||||||
-- It is required to be in the same format as the do_line function:
|
-- It is required to be in the same format as the do_line function:
|
||||||
-- A table with an "n" key, and keys 0..n-1 with line structures.
|
-- A table with an "n" key, and keys 0..n-1 with line structures.
|
||||||
function default_do_syllable(meta, styles, config, line, syl)
|
function default_do_syllable(meta, styles, config, line, syl)
|
||||||
|
aegisub.output_debug("default_do_syllable")
|
||||||
return {n=0}
|
return {n=0}
|
||||||
end
|
end
|
||||||
do_syllable = default_do_syllable
|
do_syllable = default_do_syllable
|
||||||
|
|
||||||
function adv_do_line(meta, styles, config, line)
|
function adv_do_line(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("adv_do_line")
|
||||||
local result = {n=0}
|
local result = {n=0}
|
||||||
for i = 0, line.karaoke.n-1 do
|
for i = 0, line.karaoke.n-1 do
|
||||||
|
aegisub.output_debug("adv_do_line:2:"..i)
|
||||||
local out = do_syllable(meta, styles, config, line, line.karaoke[i])
|
local out = do_syllable(meta, styles, config, line, line.karaoke[i])
|
||||||
for j = 1, out.n do
|
for j = 1, out.n do
|
||||||
table.insert(result, out[j])
|
table.insert(result, out[j])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
aegisub.output_debug("adv_do_line:3")
|
||||||
return result
|
return result
|
||||||
end
|
end
|
||||||
do_line = adv_do_line
|
do_line = adv_do_line
|
||||||
|
|
|
@ -66,45 +66,66 @@
|
||||||
-- end_time - End time of the syllable, similar to start_time
|
-- end_time - End time of the syllable, similar to start_time
|
||||||
|
|
||||||
|
|
||||||
|
-- This one is used
|
||||||
|
aegisub.output_warning = aegisub.output_debug
|
||||||
|
-- Comment out this line to enable debugging messages
|
||||||
|
aegisub.output_debug = function() end
|
||||||
|
|
||||||
-- Return a replacement text for a syllable
|
-- Return a replacement text for a syllable
|
||||||
function default_do_syllable(meta, styles, config, line, syl)
|
function default_do_syllable(meta, styles, config, line, syl)
|
||||||
|
aegisub.output_debug("default_do_syllable")
|
||||||
return syl.text
|
return syl.text
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Decide whether or not to process a line
|
-- Decide whether or not to process a line
|
||||||
function default_do_line_decide(meta, styles, config, line)
|
function default_do_line_decide(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("default_do_line_decide")
|
||||||
return line.kind == "dialogue"
|
return line.kind == "dialogue"
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Return a text to prefix the line
|
-- Return a text to prefix the line
|
||||||
function default_do_line_start(meta, styles, config, line)
|
function default_do_line_start(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("default_do_line_start")
|
||||||
return ""
|
return ""
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Return a text to suffix the line
|
-- Return a text to suffix the line
|
||||||
function default_do_line_end(meta, styles, config, line)
|
function default_do_line_end(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("default_do_line_end")
|
||||||
return ""
|
return ""
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Process an entire line (which has pre-calculated extra data in it already)
|
-- Process an entire line (which has pre-calculated extra data in it already)
|
||||||
-- Return a table of replacement lines
|
-- Return a table of replacement lines
|
||||||
function default_do_line(meta, styles, config, line)
|
function default_do_line(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("default_do_line")
|
||||||
|
|
||||||
-- Check if the line should be processed at all
|
-- Check if the line should be processed at all
|
||||||
if not do_line_decide(meta, styles, config, line) then
|
if not do_line_decide(meta, styles, config, line) then
|
||||||
return {n=0}
|
return {n=0}
|
||||||
end
|
end
|
||||||
|
aegisub.output_debug("default_do_line:2")
|
||||||
|
|
||||||
-- Create a new local var for the line replacement text, set it to line prefix
|
-- Create a new local var for the line replacement text, set it to line prefix
|
||||||
-- This is to make sure the actual line text isn't replaced before the line has been completely processed
|
-- This is to make sure the actual line text isn't replaced before the line has been completely processed
|
||||||
local newtext = do_line_start(meta, styles, config, line)
|
local newtext = do_line_start(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("default_do_line:3")
|
||||||
|
|
||||||
-- Loop over the syllables
|
-- Loop over the syllables
|
||||||
for i = 0, line.karaoke.n-1 do
|
for i = 0, line.karaoke.n-1 do
|
||||||
|
aegisub.output_debug("default_do_line:4:"..i)
|
||||||
-- Append the replacement for each syllable onto the line
|
-- Append the replacement for each syllable onto the line
|
||||||
newtext = newtext .. do_syllable(meta, styles, config, line, line.karaoke[i])
|
newtext = newtext .. do_syllable(meta, styles, config, line, line.karaoke[i])
|
||||||
end
|
end
|
||||||
|
aegisub.output_debug("default_do_line:5")
|
||||||
|
|
||||||
-- Append line suffix
|
-- Append line suffix
|
||||||
newtext = newtext .. do_line_end(meta, styles, config, line)
|
newtext = newtext .. do_line_end(meta, styles, config, line)
|
||||||
|
aegisub.output_debug("default_do_line:6")
|
||||||
|
|
||||||
-- Now replace the line text
|
-- Now replace the line text
|
||||||
line.text = newtext
|
line.text = newtext
|
||||||
|
|
||||||
-- And return a table with one entry
|
-- And return a table with one entry
|
||||||
return {n=1; [1]=line}
|
return {n=1; [1]=line}
|
||||||
end
|
end
|
||||||
|
@ -119,16 +140,30 @@ do_line = default_do_line
|
||||||
precalc_start_progress = 0
|
precalc_start_progress = 0
|
||||||
precalc_end_progress = 50
|
precalc_end_progress = 50
|
||||||
function precalc_syllable_data(meta, styles, lines)
|
function precalc_syllable_data(meta, styles, lines)
|
||||||
|
aegisub.output_debug("precalc_syllable_data")
|
||||||
aegisub.set_status("Preparing syllable-data")
|
aegisub.set_status("Preparing syllable-data")
|
||||||
for i = 0, lines.n-1 do
|
for i = 0, lines.n-1 do
|
||||||
|
aegisub.output_debug("precalc_syllable_data:2:"..i)
|
||||||
aegisub.report_progress(precalc_start_progress + i/lines.n*(precalc_end_progress-precalc_start_progress))
|
aegisub.report_progress(precalc_start_progress + i/lines.n*(precalc_end_progress-precalc_start_progress))
|
||||||
local line, style = lines[i]
|
local line, style = lines[i]
|
||||||
-- Index number of the line
|
-- Index number of the line
|
||||||
line.i = i
|
line.i = i
|
||||||
|
-- Linked list-style access
|
||||||
|
line.prev = lines[i-1]
|
||||||
|
line.next = lines[i+1]
|
||||||
|
aegisub.output_debug("precalc_syllable_data:3:")
|
||||||
if line.kind == "dialogue" or line.kind == "comment" then
|
if line.kind == "dialogue" or line.kind == "comment" then
|
||||||
|
aegisub.output_debug("precalc_syllable_data:4:")
|
||||||
local style = styles[line.style]
|
local style = styles[line.style]
|
||||||
|
if not style then
|
||||||
|
-- ok, so the named style does not exist... well there MUST be at least ONE style
|
||||||
|
-- pick the first one
|
||||||
|
style = styles[0]
|
||||||
|
aegisub.output_warning(string.format("WARNING! You have a line using a style named \"%s\", but that style does not exist! Using the first defined style (\"%s\") instead.", line.style, style.name))
|
||||||
|
end
|
||||||
-- Line dimensions
|
-- Line dimensions
|
||||||
line.width, line.height, line.ascent, line.extlead = aegisub.text_extents(style, line.text_stripped)
|
line.width, line.height, line.ascent, line.extlead = aegisub.text_extents(style, line.text_stripped)
|
||||||
|
aegisub.output_debug("precalc_syllable_data:5:")
|
||||||
-- Line position
|
-- Line position
|
||||||
line.centerleft = math.floor((meta.res_x - line.width) / 2)
|
line.centerleft = math.floor((meta.res_x - line.width) / 2)
|
||||||
line.centerright = meta.res_x - line.centerleft
|
line.centerright = meta.res_x - line.centerleft
|
||||||
|
@ -136,14 +171,17 @@ function precalc_syllable_data(meta, styles, lines)
|
||||||
line.duration = (line.end_time - line.start_time) * 10
|
line.duration = (line.end_time - line.start_time) * 10
|
||||||
-- Style reference
|
-- Style reference
|
||||||
line.styleref = style
|
line.styleref = style
|
||||||
|
aegisub.output_debug("precalc_syllable_data:6:")
|
||||||
-- Process the syllables
|
-- Process the syllables
|
||||||
local curx, curtime = 0, 0
|
local curx, curtime = 0, 0
|
||||||
for j = 0, line.karaoke.n-1 do
|
for j = 0, line.karaoke.n-1 do
|
||||||
|
aegisub.output_debug("precalc_syllable_data:7::"..j)
|
||||||
local syl = line.karaoke[j]
|
local syl = line.karaoke[j]
|
||||||
-- Syllable index
|
-- Syllable index
|
||||||
syl.i = j
|
syl.i = j
|
||||||
-- Syllable dimensions
|
-- Syllable dimensions
|
||||||
syl.width, syl.height, syl.ascent, syl.extlead = aegisub.text_extents(style, syl.text_stripped)
|
syl.width, syl.height, syl.ascent, syl.extlead = aegisub.text_extents(style, syl.text_stripped)
|
||||||
|
aegisub.output_debug("precalc_syllable_data:8::")
|
||||||
-- Syllable positioning
|
-- Syllable positioning
|
||||||
syl.left = curx
|
syl.left = curx
|
||||||
syl.center = math.floor(curx + syl.width/2)
|
syl.center = math.floor(curx + syl.width/2)
|
||||||
|
@ -160,15 +198,19 @@ end
|
||||||
|
|
||||||
-- Everything else is done in the process_lines function
|
-- Everything else is done in the process_lines function
|
||||||
function skel_process_lines(meta, styles, lines, config)
|
function skel_process_lines(meta, styles, lines, config)
|
||||||
|
aegisub.output_debug("skel_process_lines")
|
||||||
-- Do a little pre-calculation for each line and syllable
|
-- Do a little pre-calculation for each line and syllable
|
||||||
precalc_syllable_data(meta, styles, lines)
|
precalc_syllable_data(meta, styles, lines)
|
||||||
|
aegisub.output_debug("skel_process_lines:2")
|
||||||
-- A var for the new output
|
-- A var for the new output
|
||||||
local result = {n=0}
|
local result = {n=0}
|
||||||
aegisub.set_status("Running main-processing")
|
aegisub.set_status("Running main-processing")
|
||||||
-- Now do the usual processing
|
-- Now do the usual processing
|
||||||
for i = 0, lines.n-1 do
|
for i = 0, lines.n-1 do
|
||||||
|
aegisub.output_debug("skel_process_lines:3:"..i)
|
||||||
aegisub.report_progress(50+i/lines.n*50)
|
aegisub.report_progress(50+i/lines.n*50)
|
||||||
if do_line_decide(meta, styles, config, lines[i]) then
|
if do_line_decide(meta, styles, config, lines[i]) then
|
||||||
|
aegisub.output_debug("skel_process_lines:4:..i")
|
||||||
-- Get replacement lines
|
-- Get replacement lines
|
||||||
repl = do_line(meta, styles, config, lines[i])
|
repl = do_line(meta, styles, config, lines[i])
|
||||||
-- Append to result table
|
-- Append to result table
|
||||||
|
|
|
@ -165,3 +165,9 @@ function string.headtail(s)
|
||||||
return s, ""
|
return s, ""
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- Exclusive or of two boolean values
|
||||||
|
function xor(a, b)
|
||||||
|
return (a or b) and not (a and b)
|
||||||
|
end
|
||||||
|
|
|
@ -4,6 +4,12 @@ Please visit http://aegisub.net to download latest version
|
||||||
= 1.10 beta - 2006.01.?? ===========================
|
= 1.10 beta - 2006.01.?? ===========================
|
||||||
|
|
||||||
- Always defaults to Audio Cache=1 (ram) now (Myrsloik)
|
- Always defaults to Audio Cache=1 (ram) now (Myrsloik)
|
||||||
|
- Automation: Added xor(a,b) boolean logical function to utils.lua (jfs)
|
||||||
|
- Automation: Various changes to karaskel.lua and karaskel-adv.lua: (jfs)
|
||||||
|
o Added some debug-calls (which are disable by default; aegisub.output_debug is replaced with a do-nothing function (you can change this in karaskel.lua)
|
||||||
|
o The regular aegisub.output_debug is aliased to aegisub.output_warning, in order to always be able to show real warnings, in case something goes wrong
|
||||||
|
o Fixed bug, triggered when a line had a style not defined in the subs. A warning is now shown instead.
|
||||||
|
|
||||||
|
|
||||||
= 1.09 beta - 2006.01.16 ===========================
|
= 1.09 beta - 2006.01.16 ===========================
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue