Merge pull request #110 from patacrep/nolyrics

Improve "nolyrics" section support

patacrep/data/examples/example-test.sb

@@ -0,0 +1,13 @@
+{
+"bookoptions" : [
+    "diagram",
+    "repeatchords",
+    "lilypond",
+    "pictures"
+  ],
+"booktype" : "chorded",
+"template" : "patacrep.tex",
+"encoding": "utf8",
+ "content": ["tests/*.sg", "tests/*.sgc"]
+
+}

patacrep/data/examples/songs/tests/nolyrics.sgc

@@ -0,0 +1,11 @@
+{title: No lyrics}
+{subtitle: Test of verses without any lyrics}
+
+[A]This is a [Bb]verse
+With [C#]lyrics
+
+[Adim] [Dmaj]
+[Em3]
+
+[G4]This is [Emaj3]another
+[Absus8]With lyrics

patacrep/songs/chordpro/data/latex/content_verse

@@ -1,11 +1,11 @@
 (*- if content.nolyrics -*)
+\ifchorded
 \begin{verse*}
-\musicnote{\nolyrics
   (* for line in content.lines *)
-    (( render(line) ))
+    \musicnote {\nolyrics (( render(line) ))}
   (* endfor *)
-}
 \end{verse*}
+\fi
 (*- else *)
 \begin{(( content.type ))}
   (* for line in content.lines *)

test/test_chordpro/nolyrics.tex

@@ -12,19 +12,19 @@
 \end{verse}
 
 
+\ifchorded
 \begin{verse*}
-\musicnote{\nolyrics
+    \musicnote {\nolyrics \[A B#]}
-    \[A B#]
-}
 \end{verse*}
+\fi
 
 
+\ifchorded
 \begin{verse*}
-\musicnote{\nolyrics
+    \musicnote {\nolyrics \[A] \[B]}
-    \[A] \[B]
+    \musicnote {\nolyrics \[C]}
-    \[C]
-}
 \end{verse*}
+\fi
 
 
 \begin{verse}