From f9c3b3d5056031fa5f0fbced5b630541a38597c6 Mon Sep 17 00:00:00 2001
From: Oliverpool <oliverpool@hotmail.fr>
Date: Thu, 22 Oct 2015 08:52:48 +0200
Subject: [PATCH] Improve html template

---
 .../songs/chordpro/data/html/content_verse    |  8 ++-
 test/test_chordpro/newline.html               | 53 ++++++++-----------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/patacrep/songs/chordpro/data/html/content_verse b/patacrep/songs/chordpro/data/html/content_verse
index 6fe21f6b..2b3e6fe3 100644
--- a/patacrep/songs/chordpro/data/html/content_verse
+++ b/patacrep/songs/chordpro/data/html/content_verse
@@ -1,5 +1,11 @@
+(* if content.directive() *)
+<p class="directives">
+(*- elif content.nolyrics -*)
+<p class="nolyrics">
+(*- else *)
 <p class="(( content.type ))">
-  (* for line in content.lines *)
+(*- endif *)
+  (* for line in content.lines -*)
     (( render(line) ))
     (*- if not loop.last *)<br>
     (* endif *)
diff --git a/test/test_chordpro/newline.html b/test/test_chordpro/newline.html
index aca33fa6..5540af64 100644
--- a/test/test_chordpro/newline.html
+++ b/test/test_chordpro/newline.html
@@ -1,50 +1,43 @@
+
 <span class="song-language">Lang: en</span><br>
 
 
 
 <div class="song_content">
-<p class="verse">
-    This is a verse<br>
-    With a new line<br>
-    <br>
-    The second part of the verse<br>
-    Is this line
+<p class="verse">This is a verse<br>
+With a new line<br>
+<br>
+The second part of the verse<br>
+Is this line
 </p>
 
-<p class="verse">
-    Here is a new line at the end<br>
-    
+<p class="verse">Here is a new line at the end<br>
+
 </p>
 
-<p class="verse">
-    Foo bar
+<p class="verse">Foo bar
 </p>
 
-<p class="verse">
-    <br>
-    And a new line<br>
-    At the beginning
+<p class="verse"><br>
+And a new line<br>
+At the beginning
 </p>
 
-<p class="chorus">
-    New lines can also<br>
-    <br>
-    Be in chorus
+<p class="chorus">New lines can also<br>
+<br>
+Be in chorus
 </p>
 
-<p class="bridge">
-    New lines can also<br>
-    <br>
-    Be in bridges
+<p class="bridge">New lines can also<br>
+<br>
+Be in bridges
 </p>
 
-<p class="verse">
-    New lines can also<br>
-    <br>
-    Be surrounded by spaces
+<p class="verse">New lines can also<br>
+<br>
+Be surrounded by spaces
 </p>
 
-<p class="verse">
-    New lines cannot
+<p class="verse">New lines cannot
 </p>
-</div>
+</div>
\ No newline at end of file