diff --git a/musique/exercice.py b/musique/exercice.py index 0b9b15189bcbc35ecf6982f08c143f6642937170..cd8850a2b3b7dd82310630742f090bf311d5143a 100644 --- a/musique/exercice.py +++ b/musique/exercice.py @@ -204,6 +204,9 @@ class GenerateurExercice(GammeTemperee): if note[0] > 0: result += str(int(round(note[0]))) + " & " + '{0:.2f}'.format(note[1]).replace(".", ",") + " & " result += self.frequenceToLaTeX(note[0]) + "& " + self.nomDuree(note[1]) + " \\\\\n" + else: + result += " & "+ '{0:.2f}'.format(note[1]).replace(".", ",") + " & " + result += " & " + self.nomDuree(note[1]) + " \\\\\n" result += "\\hline\n" else: result += ', '.join(['{0:.2f}'.format(n) for n in note[0]]) + " & " + '{0:.2f}'.format(note[1]).replace(".", ",") diff --git a/musique/gamme.py b/musique/gamme.py index 255ccb0c9ce29cf7fb16afb99f87d53e7d85775b..221aac81c41074674f38579987ea0b50f1bdc73a 100644 --- a/musique/gamme.py +++ b/musique/gamme.py @@ -67,7 +67,7 @@ class GammeTemperee: notes = [ ["do"], ["do$\\sharp$", "ré$\\flat$"], ["ré"], ["ré$\\sharp$", "mi$\\flat$"], ["mi"], ["fa"], ["fa$\\sharp$", "sol$\\flat$"], ["sol"], ["sol$\\sharp$", "la$\\flat$"], ["la"], ["la$\\sharp$", "si$\\flat$"], ["si"]] - return ", ".join([n + "$^" + str(octave) + "$" for n in notes[idNote]]) + return ", ".join([n + " $^" + str(octave) + "$" for n in notes[idNote]]) # definition de la frequence du silence def silence(self):