Merge 890abc59db into 48040d2215

patacrep/data/templates/songbook_model.yml

@@ -55,6 +55,14 @@ schema:
               value: "guitar"
             - type: //str
               value: "ukulele"
+            - type: //arr
+              contents:
+                type: //any
+                of:
+                  - type: //str
+                    value: "guitar"
+                  - type: //str
+                    value: "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

@@ -326,4 +326,7 @@ def iter_bookoptions(config):
         elif config['chords']['diagrampage'] == "all":
             yield 'diagrampage'
 
-        yield config['chords']['instrument']
+        if isinstance(config['chords']['instrument'], str):
+            yield config['chords']['instrument']
+        else:
+            yield from config['chords']['instrument']