summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorValentin Villenave <valentin@villenave.net>2016-03-07 09:56:21 +0100
committerValentin Villenave <valentin@villenave.net>2016-03-07 09:56:21 +0100
commite45059ae37b240ce52639ad5c49110b510a89481 (patch)
treea3d8b44fabc4cff7fec92241081ca772b1357576 /python
parenta9aaa3c8b1e39251015e1695506e064d47da668c (diff)
Define French as a separate input language
French users now have the ability to enter the D pitch as "ré" instead of Italian-like "re". In addition, the French input language accepts double sharps entered using the -x suffix.
Diffstat (limited to 'python')
-rw-r--r--python/musicexp.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/python/musicexp.py b/python/musicexp.py
index a564f29ce5..86eb2b1cfe 100644
--- a/python/musicexp.py
+++ b/python/musicexp.py
@@ -258,6 +258,10 @@ def pitch_italiano (pitch):
def pitch_catalan (pitch):
return pitch_italiano (pitch)
+def pitch_francais (pitch):
+ str = pitch_generic (pitch, ['do', 'ré', 'mi', 'fa', 'sol', 'la', 'si'], ['b', 'sb', 'sd', 'd'])
+ return str
+
def pitch_espanol (pitch):
str = pitch_generic (pitch, ['do', 're', 'mi', 'fa', 'sol', 'la', 'si'], ['b', None, None, 's'])
return str
@@ -275,8 +279,10 @@ def set_pitch_language (language):
"norsk": pitch_norsk,
"svenska": pitch_svenska,
"italiano": pitch_italiano,
+ "français": pitch_francais,
"catalan": pitch_catalan,
"espanol": pitch_espanol,
+ "español": pitch_espanol,
"vlaams": pitch_vlaams}
pitch_generating_function = function_dict.get (language, pitch_general)