More elegant bugfix

patacrep/data/templates/songbook/songs.tex

@@ -30,7 +30,6 @@
 (* block songbookpreambule *)
 (( super() ))
 
-\PassOptionsToPackage{french}{babel}
 (* for lang in _langs|sort -*)
     \PassOptionsToPackage{(( lang | lang2babel ))}{babel}
 (* endfor *)

patacrep/data/templates/styles/patacrep.sty

@@ -400,7 +400,9 @@
 \renewcommand{\textnote}[2][]{%
   \vspace{.1cm}
   \IfStrEq{}{#1}{\@textnoteold{#2}}{
-    \iflanguage{#1}{\@textnoteold{#2}}{}
+    \IfStrEq{\mainlanguage}{#1}{
+      \@textnoteold{#2}
+    }{}
   }
 }
 
@@ -408,7 +410,9 @@
 \renewcommand{\musicnote}[2][]{%
   \vspace{.1cm}
   \IfStrEq{}{#1}{\@musicnoteold{#2}}{
-    \iflanguage{#1}{\@musicnoteold{#2}}{}
+    \IfStrEq{\mainlanguage}{#1}{
+      \@musicnoteold{#2}
+    }{}
   }
 }
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

test/test_book/content.tex.control

@@ -33,7 +33,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}

test/test_book/datadir.tex.control

@@ -35,7 +35,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}

test/test_book/lang_de.tex.control

@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[ngerman]{babel}
 \lang{ngerman}
 

test/test_book/lang_default.tex.control

@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[english]{babel}
 \lang{english}
 

test/test_book/lang_en.tex.control

@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[english]{babel}
 \lang{english}
 

test/test_book/lang_fr.tex.control

@@ -42,7 +42,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \usepackage[french]{babel}
 \lang{french}
 

test/test_book/languages.tex.control

@@ -34,7 +34,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{spanish}{babel}
 \PassOptionsToPackage{french}{babel}

test/test_book/onthefly/content.onthefly.tex.control

@@ -32,7 +32,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}

test/test_book/special.tex.control

@@ -43,7 +43,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
 \lang{english}

test/test_book/syntax.tex.control

@@ -34,7 +34,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
 \lang{english}

test/test_book/unicode.tex.control

@@ -34,7 +34,6 @@ guitar,
 \usepackage{lmodern}
 
 
-\PassOptionsToPackage{french}{babel}
 \PassOptionsToPackage{english}{babel}
 \usepackage[english]{babel}
 \lang{english}