Browse Source

small changes

master
Nils 2 months ago
parent
commit
a94428cbc8
8 changed files with 146 additions and 11 deletions
  1. +0
    -1
      .gitignore
  2. +131
    -0
      .gitignore
  3. +1
    -1
      README.md
  4. +2
    -2
      documentation/laborejo.1
  5. +1
    -1
      documentation/out/english.html
  6. +1
    -1
      documentation/out/german.html
  7. +5
    -4
      engine/api.py
  8. +5
    -1
      engine/tempotrack.py

+ 0
- 1
.gitignore View File

@@ -1 +0,0 @@
template/gitignore.template

+ 131
- 0
.gitignore View File

@@ -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



+ 1
- 1
README.md View File

@@ -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

+ 2
- 2
documentation/laborejo.1 View File

@@ -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

+ 1
- 1
documentation/out/english.html View File

@@ -722,7 +722,7 @@ The program is split in two parts. A shared "template" between the Laborejo Soft
</div>
<div id="footer">
<div id="footer-text">
Last updated 2021-01-18 00:43:08 +0100
Last updated 2021-02-12 17:40:26 +0100
</div>
</div>
</body>

+ 1
- 1
documentation/out/german.html View File

@@ -2220,7 +2220,7 @@ Ansonsten starten Sie laborejo mit diesem Befehl, Sprachcode ändern, vom Termin
</div>
<div id="footer">
<div id="footer-text">
Last updated 2021-01-18 00:43:08 +0100
Last updated 2021-02-12 17:40:26 +0100
</div>
</div>
</body>

+ 5
- 4
engine/api.py View File

@@ -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:

+ 5
- 1
engine/tempotrack.py View File

@@ -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":""}

Loading…
Cancel
Save