Integrated finetuneas

.gitignore

@@ -14,6 +14,7 @@ tmp
 # service scripts
 zzz_*.py
 zzz_*.sh
+zzz_long_tests
 
 # Eclipse/PyDev
 .project

MANIFEST.in

@@ -1,3 +1,4 @@
+recursive-include aeneas/res *
 recursive-include aeneas/tools/res *
 include check_dependencies.py
 recursive-include docs *
@@ -7,4 +8,5 @@ recursive-include licenses *
 include README.md
 include README.txt
 include requirements.txt
+recursive-include thirdparty *
 include VERSION

README.md

@@ -2,8 +2,8 @@
 
 **aeneas** is a Python library and a set of tools to automagically synchronize audio and text.
 
-* Version: 1.3.0
-* Date: 2015-10-14
+* Version: 1.3.1
+* Date: 2015-10-XX
 * Developed by: [ReadBeyond](http://www.readbeyond.it/)
 * Lead Developer: [Alberto Pettarin](http://www.albertopettarin.it/)
 * License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -323,6 +323,7 @@ Changelog: [http://www.readbeyond.it/aeneas/docs/changelog.html](http://www.read
 * Automated detection of audio head/tail
 * MFCC and DTW computed as Python C extensions to reduce the processing time
 * On Linux, `espeak` called via a Python C extension for faster audio synthesis
+* Output an HTML file (from `finetuneas` project) for fine tuning the sync map manually
 
 ## Limitations and Missing Features 
 
@@ -340,7 +341,6 @@ Changelog: [http://www.readbeyond.it/aeneas/docs/changelog.html](http://www.read
 * Reporting the alignment score
 * Improving (removing?) dependency from `espeak`, `ffmpeg`, `ffprobe` executables
 * Multilevel sync map granularity (e.g., multilevel SMIL output)
-* Supporting input text encodings other than UTF-8
 * Better documentation
 * Testing other approaches, like HMM
 * Publishing the package on PyPI
@@ -399,6 +399,12 @@ is a verbatim copy from the
 [espeak project](http://espeak.sourceforge.net/).
 See [`licenses/eSpeak.txt`](licenses/eSpeak.txt) for details.
 
+The HTML file `aeneas/res/finetuneas.html`
+is a verbatim copy from the
+[finetuneas project](https://github.com/ozdefir/finetuneas),
+courtesy of Firat Özdemir.
+See [`licenses/finetuneas.txt`](licenses/finetuneas.txt) for details.
+
 Audio files contained in the unit tests `aeneas/tests/res/` directory
 are adapted from recordings produced by
 the [LibriVox Project](http://www.librivox.org)

README.txt

@@ -4,8 +4,8 @@ aeneas
 **aeneas** is a Python library and a set of tools to automagically
 synchronize audio and text.
 
--  Version: 1.3.0
--  Date: 2015-10-14
+-  Version: 1.3.1
+-  Date: 2015-10-XX
 -  Developed by: `ReadBeyond <http://www.readbeyond.it/>`__
 -  Lead Developer: `Alberto Pettarin <http://www.albertopettarin.it/>`__
 -  License: the GNU Affero General Public License Version 3 (AGPL v3)
@@ -352,6 +352,8 @@ Supported Features
    time
 -  On Linux, ``espeak`` called via a Python C extension for faster audio
    synthesis
+-  Output an HTML file (from ``finetuneas`` project) for fine tuning the
+   sync map manually
 
 Limitations and Missing Features
 --------------------------------
@@ -375,7 +377,6 @@ TODO List
 -  Improving (removing?) dependency from ``espeak``, ``ffmpeg``,
    ``ffprobe`` executables
 -  Multilevel sync map granularity (e.g., multilevel SMIL output)
--  Supporting input text encodings other than UTF-8
 -  Better documentation
 -  Testing other approaches, like HMM
 -  Publishing the package on PyPI
@@ -432,6 +433,11 @@ The C header ``speak_lib.h`` for ``espeak`` is a verbatim copy from the
 `espeak project <http://espeak.sourceforge.net/>`__. See
 ```licenses/eSpeak.txt`` <licenses/eSpeak.txt>`__ for details.
 
+The HTML file ``aeneas/res/finetuneas.html`` is a verbatim copy from the
+`finetuneas project <https://github.com/ozdefir/finetuneas>`__, courtesy
+of Firat Özdemir. See
+```licenses/finetuneas.txt`` <licenses/finetuneas.txt>`__ for details.
+
 Audio files contained in the unit tests ``aeneas/tests/res/`` directory
 are adapted from recordings produced by the `LibriVox
 Project <http://www.librivox.org>`__ and they are in the public domain.

VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

aeneas/__init__.py

@@ -56,7 +56,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/adjustboundaryalgorithm.py

@@ -19,7 +19,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/analyzecontainer.py

@@ -23,7 +23,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/audiofile.py

@@ -27,7 +27,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cdtw.c

@@ -9,7 +9,7 @@ __copyright__ = """
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cdtw_setup.py

@@ -22,7 +22,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -38,7 +38,7 @@
 
 setup(
     name="cdtw",
-    version="1.3.0",
+    version="1.3.1",
     description="""
     Python C Extension for computing the DTW as fast as your bare metal allows.
     """,

aeneas/cew.c

@@ -9,7 +9,7 @@ __copyright__ = """
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cew_setup.py

@@ -20,7 +20,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -36,7 +36,7 @@
 
 setup(
     name="cew",
-    version="1.3.0",
+    version="1.3.1",
     description="""
     Python C Extension for synthesizing text with espeak.
     """,

aeneas/cmfcc.c

@@ -9,7 +9,7 @@ __copyright__ = """
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/cmfcc_setup.py

@@ -22,7 +22,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -38,7 +38,7 @@
 
 setup(
     name="cmfcc",
-    version="1.3.0",
+    version="1.3.1",
     description="""
     Python C Extension for computing the MFCCs as fast as your bare metal allows.
     """,

aeneas/container.py

@@ -31,7 +31,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/downloader.py

@@ -17,7 +17,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/dtw.py

@@ -42,7 +42,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/espeakwrapper.py

@@ -22,7 +22,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/executejob.py

@@ -25,7 +25,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/executetask.py

@@ -32,7 +32,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/ffmpegwrapper.py

@@ -19,7 +19,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/ffprobewrapper.py

@@ -20,7 +20,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/globalconstants.py

@@ -13,7 +13,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/globalfunctions.py

@@ -21,7 +21,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 
@@ -671,16 +671,46 @@ def delete_file(handler, path):
         except:
             pass
 
-def get_rel_path(path):
+def get_rel_path(path, from_path=None, absolute=False):
     """
-    Get path relative to the CWD
+    Get a path relative to the CWD or ``from_path``.
 
     :param path: the file path
     :type  path: string (path)
+    :param from_path: the current directory; if None, use CWD
+    :type  from_path: string (path)
+    :param absolute: if True, output an absolute path
+    :type  absolute: bool
+    :rtype: string (path)
     """
-    current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
+    if path is None:
+        return None
+    if from_path is None:
+        current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
+    else:
+        current_directory = from_path
     target = os.path.join(current_directory, path)
-    return os.path.relpath(target)
+    rel_path = os.path.relpath(target)
+    if absolute:
+        return os.path.abspath(rel_path)
+    else:
+        return rel_path
+
+def get_abs_path(path, from_file):
+    """
+    Get a path relative to the parent directory of ``from_file``,
+    and return it as an absolute path.
+
+    This method is intented to be called with ``__file__``
+    as second argument.
+
+    :param path: the file path
+    :type  path: string (path)
+    :param from_file: the reference file
+    :type  from_file: string (path)
+    :rtype: string (path)
+    """
+    return get_rel_path(path, os.path.dirname(from_file), True)
 
 def human_readable_number(number, suffix=""):
     """

aeneas/hierarchytype.py

@@ -13,7 +13,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/idsortingalgorithm.py

@@ -16,7 +16,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/job.py

@@ -18,7 +18,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"
 

aeneas/language.py

@@ -12,7 +12,7 @@
     Copyright 2015,      Alberto Pettarin (www.albertopettarin.it)
     """
 __license__ = "GNU AGPL v3"
-__version__ = "1.3.0"
+__version__ = "1.3.1"
 __email__ = "[email protected]"
 __status__ = "Production"