From a94428cbc8d5bedea3402f4aaa99c7c79cce48fd Mon Sep 17 00:00:00 2001 From: Nils <> Date: Sun, 11 Jul 2021 23:35:16 +0200 Subject: [PATCH] small changes --- .gitignore | 132 ++++++++++++++++++++++++++++++++- README.md | 2 +- documentation/laborejo.1 | 4 +- documentation/out/english.html | 2 +- documentation/out/german.html | 2 +- engine/api.py | 9 ++- engine/tempotrack.py | 6 +- 7 files changed, 146 insertions(+), 11 deletions(-) mode change 120000 => 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 120000 index 68fd69a..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -template/gitignore.template \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..02c56ef --- /dev/null +++ b/.gitignore @@ -0,0 +1,131 @@ +# Byte-compiled / optimized / DLL files +*__pycache__ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + + +#build process +*.bin +*.build +build/ +Makefile +compiledprefix.py +sitepackages +template/calfbox/.deps +template/calfbox/build +template/calfbox/autom4te.cache +template/calfbox/Makefile.in +template/calfbox/aclocal.m4 +template/calfbox/compile +template/calfbox/config.h +template/calfbox/config.h.in +template/calfbox/config.h.in~ +template/calfbox/config.status +template/calfbox/configure +template/calfbox/depcomp +template/calfbox/install-sh +template/calfbox/ltmain.sh +template/calfbox/missing +template/calfbox/stamp-h1 + + diff --git a/README.md b/README.md index b2d4f3a..5121429 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[//]: # (Generated 2021-01-18T00:43:08.377426. Changes belong into template/documentation/readme.template) +[//]: # (Generated 2021-02-12T17:40:26.018820. Changes belong into template/documentation/readme.template) #Laborejo Program version 2.0.1 diff --git a/documentation/laborejo.1 b/documentation/laborejo.1 index a97fad1..c5b99a8 100644 --- a/documentation/laborejo.1 +++ b/documentation/laborejo.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH LABOREJO "1" "January 2021" "Laborejo 2.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.17. +.TH LABOREJO "1" "February 2021" "Laborejo 2.0.1" "User Commands" .SH NAME Laborejo - MIDI sequencer based on classical music notation .SH DESCRIPTION diff --git a/documentation/out/english.html b/documentation/out/english.html index 6e5194b..d16633a 100644 --- a/documentation/out/english.html +++ b/documentation/out/english.html @@ -722,7 +722,7 @@ The program is split in two parts. A shared "template" between the Laborejo Soft diff --git a/documentation/out/german.html b/documentation/out/german.html index 0e771f5..3cafb6d 100644 --- a/documentation/out/german.html +++ b/documentation/out/german.html @@ -2220,7 +2220,7 @@ Ansonsten starten Sie laborejo mit diesem Befehl, Sprachcode ändern, vom Termin diff --git a/engine/api.py b/engine/api.py index a7d92d3..e538bc0 100644 --- a/engine/api.py +++ b/engine/api.py @@ -2499,10 +2499,11 @@ def lilypondText(text): logger.error(err) def exportLilypond(absoluteFilePath): - try: - lilypond.saveAsLilypond(session.data, absoluteFilePath) - except Exception as err: - logger.error(err) + lilypond.saveAsLilypond(session.data, absoluteFilePath) + #try: + # lilypond.saveAsLilypond(session.data, absoluteFilePath) + #except Exception as err: + # logger.error(err) def showPDF(): try: diff --git a/engine/tempotrack.py b/engine/tempotrack.py index 2654b97..0d542d2 100644 --- a/engine/tempotrack.py +++ b/engine/tempotrack.py @@ -707,7 +707,11 @@ class TempoTrack(GraphTrackCC): return skipString else: _ly.lastItem = tempoItem - return "\\tempo {} {} = {} {}".format(tempoItem["lilypondParameters"]["tempo"], duration.baseDurationToTraditionalNumber[tempoItem["referenceTicks"]], str(tempoItem["unitsPerMinute"]), skipString) + t = tempoItem["lilypondParameters"]["tempo"] + d = duration.ticksToLilypond(tempoItem["referenceTicks"]) + upm = str(tempoItem["unitsPerMinute"]) + return f"\\tempo {t} {d} = {upm} {skipString}" + #return "\\tempo {} {} = {} {}".format(tempoItem["lilypondParameters"]["tempo"], duration.baseDurationToTraditionalNumber[tempoItem["referenceTicks"]], str(tempoItem["unitsPerMinute"]), skipString) raise NotImplementedError _ly.lastItem = {"referenceTicks":"", "unitsPerMinute":""}