From d124942de6743a29a8f3ee2f1c89da4d387ae146 Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Thu, 15 May 2014 10:49:31 +0200
Subject: [PATCH] =?UTF-8?q?Choix=20des=20notes=20moins=20li=C3=A9=20=C3=A0?=
 =?UTF-8?q?=20la=20langue=20fran=C3=A7aise?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 songbook_core/data/templates/default.tex | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/songbook_core/data/templates/default.tex b/songbook_core/data/templates/default.tex
index bf4282fc..3a413cf0 100644
--- a/songbook_core/data/templates/default.tex
+++ b/songbook_core/data/templates/default.tex
@@ -59,9 +59,9 @@
                               "french": "Options pour traiter les noms d'auteurs (commandes LaTeX authsepword, authignoreword, authbyword)"},
                "default": {"default": {}}
                },
-"alphascale": {"description": {"english": "Use alphabetic notes names (A B C ...) in french songbooks",
-                              "french": "Utiliser la notation anglo-saxonne (A B C ...) pour les accords"},
-                  "default": {"default": false}
+"notenamesout": {"description": {"english": "Note names. Can be 'solfedge' (Do, Re, Mi...) or 'alphascale' (A, B, C...).",
+                              "french": "Nom des notes : 'solfedge' (Do, Ré, Mi...) ou 'alphascale' (A, B, C...)."},
+                  "default": {"default": "alphascale", "french": "solfedge"}
                   }
 }
 (* endvariables *)
@@ -102,8 +102,9 @@
       (* endfor *)
    (* endfor*)
    
-   %! lang is defined in layout.tex
-   (* if lang=="french" and not alphascale *)
+   (* if notenamesout=="alphascale" *)
+      \notenamesout{A}{B}{C}{D}{E}{F}{G}
+    (* else *)
       \notenamesout{La}{Si}{Do}{R\'e}{Mi}{Fa}{Sol}
    (* endif *)
 (* endblock *)