Add a way to display both guitar and ukulele diagrams

patacrep/data/templates/songbook_model.yml

@@ -55,6 +55,8 @@ schema:
               value: "guitar"
             - type: //str
               value: "ukulele"
+            - type: //str
+              value: "guitar+ukulele"
         notation:
             type: //any
             of:

patacrep/data/templates/styles/chords.sty

@@ -242,8 +242,8 @@
       \musicnote[french]{Accordage standard : {\nolyrics \[\printnoteE{} \printnoteA{} \printnoteD{} \printnoteG{} \printnoteB{} \printnoteE{}]}}
       \musicnote[english]{Standard tuning: {\nolyrics \[\printnoteE{} \printnoteA{} \printnoteD{} \printnoteG{} \printnoteB{} \printnoteE{}]}}
     \end{verse*}
-
     \endsong
+    \sclearpage
     \fi
 
     \ifukulele
@@ -398,6 +398,7 @@
     \end{verse*}
 
     \endsong
+    \sclearpage
     \fi
 
   \end{songs}

patacrep/templates.py

@@ -325,4 +325,5 @@ def iter_bookoptions(config):
         elif config['chords']['diagrampage'] == "all":
             yield 'diagrampage'
 
-        yield config['chords']['instrument']
+        for instrument in config['chords']['instrument'].split("+"):
+            yield instrument