Merge branch 'master' into fix_appveyor

NEWS.md

@@ -4,6 +4,7 @@
   * Chordpro files
     * The capo directive is now considered [#224](https://github.com/patacrep/patacrep/pull/224)
     * The files don't need to end with a trailing line [#223](https://github.com/patacrep/patacrep/pull/223)
+    * The '&' character is correctly escaped in nolyrics environment [#236](https://github.com/patacrep/patacrep/pull/236)
   * Content files
     * The `tex` keyword correctly includes all files of the list [#228](https://github.com/patacrep/patacrep/pull/228)
     * Fix the import when the content folder is zipped [#235](https://github.com/patacrep/patacrep/pull/235)

patacrep/data/templates/songs/chordpro/latex/content_verse

@@ -6,7 +6,7 @@
 \ifchorded
 \begin{verse*}
   (* for line in content.lines *)
-    \musicnote {\nolyrics (( render(line)|replace("#", "{\shrp}") ))}
+    \musicnote {\nolyrics (( render(line)|replace("#", "{\\shrp}")|replace("&", "{\\flt}") ))}
   (* endfor *)
 \end{verse*}
 \fi

patacrep/index.py

@@ -194,6 +194,6 @@ class Index:
     def entries_to_str(self):
         """Return the LaTeX code corresponding to the index."""
         string = ""
-        for letter in sorted(self.data.keys()):
+        for letter in sorted(self.data):
             string += self.idxblock_to_str(letter, self.data[letter]) + EOL
         return string

test/__init__.py

@@ -31,4 +31,3 @@ def suite():
 
 if __name__ == "__main__":
     unittest.TextTestRunner().run(suite())
-

test/test_song/nolyrics.csg

@@ -7,7 +7,7 @@ A chorus [A]with lyrics
 [A B#]
 
 
-[A] [B]
+[A] [B&]
 [C]
 
 

test/test_song/nolyrics.csg.source

@@ -3,7 +3,7 @@ A chorus [A]with lyrics
 
 [A B#]
 
-[A] [B]
+[A] [B&]
 [C]
 
 A chorus [C]with lyrics

test/test_song/nolyrics.tsg

@@ -21,7 +21,7 @@
 
 \ifchorded
 \begin{verse*}
-    \musicnote {\nolyrics \[A] \[B]}
+    \musicnote {\nolyrics \[A] \[B{\flt}]}
     \musicnote {\nolyrics \[C]}
 \end{verse*}
 \fi