Commit 31ba7248 authored by Sebastian Reichel's avatar Sebastian Reichel

Imported Upstream version 3.0.3

parent d9aac5ef

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
File deleted
*.App
*.[oadi]
*.ass
*.avi
*.bz2
*.cache
*.dep
*.dll
*.dmg
*.exe
*.gch
*.gz
*.idb
*.ilk
*.manifest
*.mkv
*.mo
*.ncb
*.obj
*.orig
*.patch
*.pch
*.pdb
*.sdf
*.sln
*.so
*.srt
*.suo
*.swp
*.ts
*.user
*.vsp
*.y4m
*.zip
*~
.lvimrc
.syntastic_cpp_config
BuildLog.htm
Debug
Makefile.inc
Release
Win32
acconf.h
acconf.h.in
aclocal.m4
aegisub/conf.sh
aegisub/desktop/aegisub.desktop
aegisub/libaegisub/libaegisub-3.0.so.3
aegisub/reporter/reporter-3.0
aegisub/src/aegisub
aegisub/src/aegisub-3.0
aegisub/src/libresrc/bitmap.cpp
aegisub/src/libresrc/bitmap.h
aegisub/src/libresrc/default_config.cpp
aegisub/src/libresrc/default_config.h
aegisub/src/libresrc/default_config_platform.json
aegisub/tools/common-respack
aegisub/tools/osx-bundle.sed
autom4te.cache
config.log
config.status
config_windows.h
configure
svn-revision.h
svn_revision
svnmove.txt
git_version.h
......@@ -40,7 +40,7 @@ EXTRA_DIST = \
configure.in \
acconf.h.in\
configure \
svn_revision \
build/git_version.h \
config.log \
config.sub \
config.guess \
......@@ -78,7 +78,7 @@ DISTCLEANFILES += \
acconf.h \
configure \
acconf.h.in~ \
svn_revision \
build/git_version.h \
Makefile.inc \
config.log \
acconf.h.in \
......
......@@ -54,17 +54,18 @@ P_BINDIR = @bindir@
P_SBINDIR = @sbindir@
P_LIBEXEC = @libexecdir@
P_DATAROOT = @datarootdir@
datarootdir = ${P_DATAROOT}
P_SYSCONF = @sysconfdir@
P_SHAREDSTATE = @sharedstatedir@
P_LOCALSTATE = @localstatedir@
P_INCLUDE = @includedir@
P_LIB = @libdir@
P_LOCALE = $(P_DATAROOT)/locale
P_LOCALE = @localedir@
P_DESKTOP = @P_DESKTOP@
P_ICON = @P_ICON@
P_DATA = $(P_DATAROOT)/aegisub/
P_DOC = $(P_DATAROOT)/doc/aegisub/
P_DOC = @docdir@
###############
# LIBRARY FLAGS
......
/* acconf.h.in. Generated from configure.in by autoheader. */
/* acconf.h.in. Generated from configure.ac by autoheader. */
/* Name of the Aegisub gettext catalog */
#undef AEGISUB_CATALOG
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -19,25 +19,8 @@ DATA_AUTOMATION += \
include/utils-auto4.lua \
include/utils.lua
# share/doc
DATA_GENERAL_DOC = \
demos/raytracer-test1.ass \
v4-docs/basic-function-interface.txt \
v4-docs/configuration-dialogs.txt \
v4-docs/file-streams.txt \
v4-docs/misc.txt \
v4-docs/overview.txt \
v4-docs/progress-reporting.txt \
v4-docs/subtitle-data.txt \
v4-docs/template-scripting-ideas.ass
DATA_AUTOMATION_DOC += \
demos/future-windy-blur.lua \
demos/raytracer.lua
all: ;
install: install-share
@$(BIN_MKDIR) -p $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(dir $(DATA_AUTOMATION)))
@for i in $(DATA_AUTOMATION); do \
......@@ -45,11 +28,6 @@ install: install-share
$(BIN_INSTALL) $$i $(DESTDIR)$(P_DATA)/automation/$$i; \
done
DATA_SHARE_DOC = $(DATA_GENERAL_DOC) $(DATA_AUTOMATION_DOC)
EXTRA_DIST = \
$(DATA_AUTOMATION) \
$(DATA_GENERAL_DOC) \
$(DATA_AUTOMATION_DOC)
EXTRA_DIST = $(DATA_AUTOMATION)
include ../Makefile.target
......@@ -27,11 +27,13 @@ function select_overlaps(subs)
for i = 1,#subs do
local line = subs[i]
if line.class == "dialogue" then
line.i = i - 1
line.i = i
table.insert(dialogue, line)
end
end
table.sort(dialogue, function(a,b) return a.start_time < b.start_time end)
table.sort(dialogue, function(a,b)
return a.start_time < b.start_time or (a.start_time == b.start_time and a.i < b.i)
end)
local end_time = 0
local overlaps = {}
......