Correction accord mineur majeur 7

diff --git a/gtx2tex.pl b/gtx2tex.pl
index 3c6f52a..7e8fed0 100644 (file)
--- a/gtx2tex.pl
+++ b/gtx2tex.pl
@@ -100,6 +100,7 @@ $tab_begin = "\\begin{gtxtab}\n";
 $tab_end = "\\end{gtxtab}\n";
 $define = "";
 $majeur_sept = "\$^\\Delta\$";
 $tab_end = "\\end{gtxtab}\n";
 $define = "";
 $majeur_sept = "\$^\\Delta\$";

+$mineur_maj7 = "m$majeur_sept";

 $mineur = "m";
 $mineur7 = "m\$^7\$";
 $half_diminished = "m\$^{7\\flat5}\$";
 $mineur = "m";
 $mineur7 = "m\$^7\$";
 $half_diminished = "m\$^{7\\flat5}\$";


@@ -267,6 +268,7 @@ sub crdpro { # Bearbeitung der Zeile aus der Eingabedatei
        s/(gtxchord\{[A-G][B#]?)M7#([0-9]+)/\1m\$^{7\\sharp\2}\$/g; # Accord Am7#5
        s/(gtxchord\{[A-G][B#]?)M7/\1$mineur7/g;                 # Cm7
        s/(gtxchord\{[A-G][B#]?)M([0-9]+)/\1$mineur\$^{\2}\$/g;  # Cm13
        s/(gtxchord\{[A-G][B#]?)M7#([0-9]+)/\1m\$^{7\\sharp\2}\$/g; # Accord Am7#5
        s/(gtxchord\{[A-G][B#]?)M7/\1$mineur7/g;                 # Cm7
        s/(gtxchord\{[A-G][B#]?)M([0-9]+)/\1$mineur\$^{\2}\$/g;  # Cm13

+       s/(gtxchord\{[A-G][B#]?)MMAJ7/\1$mineur_maj7/g;

        s/(gtxchord\{[A-G][B#]?)M/\1$mineur/g;                   # Cm (doit être en dernier)
 
         # Accord A7b5 ou A7b9
        s/(gtxchord\{[A-G][B#]?)M/\1$mineur/g;                   # Cm (doit être en dernier)
 
         # Accord A7b5 ou A7b9

diff --git a/tests/accords.cp b/tests/accords.cp
index b9361fe..d0e4e90 100644 (file)
--- a/tests/accords.cp
+++ b/tests/accords.cp
@@ -7,6 +7,8 @@
 
 [A6]A majeur 6
 
 
 [A6]A majeur 6
 

+[EmMaj7] E mineur majeur 7
+

 [Ab13]Ab13, [Ab13/Bb]Ab13/Bb, [Abm13/Bb]Abm13/Bb, [Cm13]Cm13
 
 [A7/Bb]A7/Bb, [A7/C#]A7/C#, [A6]A6, [A6/Bb]A6/Bb [A9/Bb]A9/Bb
 [Ab13]Ab13, [Ab13/Bb]Ab13/Bb, [Abm13/Bb]Abm13/Bb, [Cm13]Cm13
 
 [A7/Bb]A7/Bb, [A7/C#]A7/C#, [A6]A6, [A6/Bb]A6/Bb [A9/Bb]A9/Bb