14 years ago · 0c73136bad
10 changed files with 237 additions and 102 deletions
--- a/crepbook.cls
+++ b/crepbook.cls
@ -40,8 +40,10 @@
 \RequirePackage{graphicx,xcolor}
 \RequirePackage{songs}
 \RequirePackage{fancybox}
-\definecolor{tango-green-3}{HTML}{4e9a06}
-\definecolor{tango-blue-3}{HTML}{204a87}
+%\definecolor{tango-green-3}{HTML}{4e9a06}
+\definecolor{tango-green-3}{HTML}{BA8D5A}
+%\definecolor{tango-blue-3}{HTML}{204a87}
+\definecolor{tango-blue-3}{HTML}{BA8D5A}
 \RequirePackage[bookmarks,
  bookmarksopen,
  colorlinks=true,
--- a/default.sb
+++ b/default.sb
@ -1,19 +1,63 @@
 {
 "songs" : [
    "Ewan_McColl/Dirty_Old_Town.sg",
+    "Jean_Schwartz/My_Irish_Molly_O.sg",
+    "Leon_Rosselson/Don_t_Get_Married_Girls.sg",
+    "Marc_Gunn/The_Leprechaun.sg",
    "Percy_French/Eileen_Og.sg",
    "Sea_Shanty/15_Marins.sg",
    "Sea_Shanty/Drunken_Sailor.sg",
+    "Sea_Shanty/John_Kanak.sg",
    "Sea_Shanty/Le_Forban_version_de_mer_.sg",
    "Sea_Shanty/Le_Forban_version_de_terre_.sg",
    "Sea_Shanty/The_Mermaid.sg",
+    "Steven_and_Peter_Jones/Kilkelly_Ireland.sg",
+    "Traditional/Blackthorn_Stick.sg",
+    "Traditional/Black_Velvet_Band.sg",
+    "Traditional/Britches_Full_Of_Stitches.sg",
+    "Traditional/Castleisland_Polka.sg",
+    "Traditional/Chattering_Magpie.sg",
+    "Traditional/Cliffs_of_Moher.sg",
+    "Traditional/Drowsy_Maggie.sg",
+    "Traditional/Eireann_Mo_Ghra_Mo_Chroi.sg",
+    "Traditional/Farewell_to_Tchernobyl.sg",
+    "Traditional/Fields_of_Athenrye.sg",
+    "Traditional/Finnegan_s_Wake.sg",
+    "Traditional/Finnish_Polka.sg",
+    "Traditional/Galway_Races.sg",
+    "Traditional/Glasgow_s_Reel.sg",
    "Traditional/Irish_Rover.sg",
+    "Traditional/Joe_Cooley_s_Reel.sg",
    "Traditional/Johnny_I_Harldy_Knew_Ye_.sg",
+    "Traditional/John_Ryan_s_Polka.sg",
+    "Traditional/Kerry.sg",
+    "Traditional/Kerry_Polka.sg",
+    "Traditional/Kesh_Jig.sg",
+    "Traditional/King_of_The_Fairies.sg",
+    "Traditional/Leaving_of_Liverpool.sg",
    "Traditional/Les_Prisons_de_Nantes.sg",
+    "Traditional/Magpie_s_Nest.sg",
+    "Traditional/Molly_Maguires.sg",
+    "Traditional/Morrison_s_Jig.sg",
+    "Traditional/Paddy_s_Return.sg",
+    "Traditional/Pride_of_Petravore.sg",
+    "Traditional/Rare_Old_Times.sg",
+    "Traditional/Rights_of_Man.sg",
    "Traditional/Rocky_Road_To_Dublin.sg",
+    "Traditional/Sally_Brown.sg",
+    "Traditional/Star_of_The_County_Down.sg",
+    "Traditional/The_Foggy_Dew.sg",
    "Traditional/The_Furze_in_Bloom_jig_.sg",
    "Traditional/The_Jug_of_Punch.sg",
+    "Traditional/The_Wild_Rover.sg",
+    "Traditional/Up_In_The_Air.sg",
+    "Traditional/Wedding_Polka.sg",
+    "Traditional/Weile_Weile_Waile.sg",
    "Traditional/Whiskey_In_The_Jar.sg",
-    "Traditional/Whiskey_You_re_the_Devil.sg"
+    "Traditional/Whiskey_You_re_the_Devil.sg",
+    "Traditionnel/Derobee_de_Guigamp.sg",
+    "Traditionnel/Les_Filles_des_Forges.sg",
+    "Traditionnel/Tri_Martolod.sg",
+    "Unknown/Bugger_Off.sg"
  ]
 }
--- a/lilypond/The_furze_in_bloom.ly
+++ b/lilypond/The_furze_in_bloom.ly
@ -0,0 +1,15 @@
+\include "header"
+\paper{paper-height = 8\cm}
+
+{
+  \relative c'
+  {
+    \time 6/8 \key d \major
+    \repeat volta 2 {e'8 d b b8 a b d8 e fis e8 fis fis e8 d b b8 a fis a8 fis d e8 fis' fis
+		     e8 d b b8 a b g'8 fis e e8 fis fis e8 d b b a fis}
+    \alternative { {a8 fis d e8 fis' fis} {a,8 fis d e4.} }
+    \repeat volta 2 {e'4. e8 fis fis e8 d b d4 a8 d8 e d d8 a a' b4 a8 fis8 a a
+		     e4. e8 fis fis e8 d b d4. e8 d b b8 a fis}
+    \alternative { {a8 fis d e4 d'8} {a8 fis d e4.} }
+  }
+}
--- a/lilypond/blackthorne_stick.ly
+++ b/lilypond/blackthorne_stick.ly
@ -0,0 +1,25 @@
+\include "header"
+\paper{paper-height = 8\cm}
+
+{
+  
+<<
+  \chords {
+    \frenchChords
+    \repeat volta 2 {\partial 8 r8 g4. e4.:m g4. c4. g4. d4.:7
+		     e4.:m d4. g4. a4.:m g4. e4.:m g4. d4.:7 g4. r4}
+    \repeat volta 2 {\partial 8 r8 e4.:m g4. e4.:m g4. g4. c4.
+		     e4.:m d4. g4. a4.:m g4. e4.:m g4. d4.:7 g4. r4}
+  }
+      
+  \relative c'
+  {
+    \time 6/8 \key g \major
+    \repeat volta 2 {\partial 8 d'8 g8 fis g e8 g e d8 b g a8 g e d8 g g fis8 g a  b8 g b a4 d8
+		     g8 fis g a8 g e d8 b g a8 g e d8 g g fis8 g a b8 g g g4}
+    \repeat volta 2 {\partial 8 d'8 e8 d d g8 d d e8 d d g8 d d e4 e8 g8 fis g e8 d b a4 d8
+		     g8 fis g a8 g e d8 b g a8 g e d8 g g fis8 g a b8 g g g4}
+  }
+>>
+
+}
--- a/lilypond/header
+++ b/lilypond/header
@ -0,0 +1,20 @@
+\version "2.12.3"
+
+\paper
+{
+  make-footer=##f
+  make-header=##f
+
+  left-margin = 0\cm
+  top-margin = 0\cm
+  bottom-margin = 0\cm
+
+  indent = 0\cm
+  between-system-padding = 1\mm
+
+  paper-width = 7.5\cm
+  line-width = 7\cm
+  paper-height = 1.6\cm
+}
+
+#(set-global-staff-size 12)
--- a/songbook.py
+++ b/songbook.py
@ -64,7 +64,7 @@ def makeTexFile(sb, output):
    name = output[:-4]

    # default value
-    template = "patacrep.tmpl"
+    template = "ancient.tmpl"
    songs = []

    # parse the songbook data
--- a/songbook.sb
+++ b/songbook.sb
@ -6,7 +6,7 @@
  ],
 "booktype" : "chorded",
 "footer" : "\\begin{flushleft}Shiver Me Timbers\\end{flushleft}",
-"indexbgcolor" : "#D1E4AE",
+"indexbgcolor" : "#BA8D5A",
 "license" : "\\input{license.tex}",
 "mail" : "benjamin.coudrin@gmail.com",
 "mainfontsize" : "10",
@ -18,64 +18,64 @@
 "version" : "1.0.0",
 "web" : "http://www.myspace.com/shivermetimbersofficial",
 "songs" : [
+    "Sea_Shanty/15_Marins.sg",
+    "Traditional/Blackthorn_Stick.sg",
+    "Traditional/Black_Velvet_Band.sg",
+    "Traditional/Britches_Full_Of_Stitches.sg",
+    "Unknown/Bugger_Off.sg",
+    "Traditional/Castleisland_Polka.sg",
+    "Traditional/Chattering_Magpie.sg",
+    "Traditional/Cliffs_of_Moher.sg",
+    "Traditionnel/Derobee_de_Guigamp.sg",
    "Ewan_McColl/Dirty_Old_Town.sg",
-    "Jean_Schwartz/My_Irish_Molly_O.sg",
    "Leon_Rosselson/Don_t_Get_Married_Girls.sg",
-    "Marc_Gunn/The_Leprechaun.sg",
-    "Percy_French/Eileen_Og.sg",
-    "Sea_Shanty/15_Marins.sg",
+    "Traditional/Drowsy_Maggie.sg",
    "Sea_Shanty/Drunken_Sailor.sg",
-    "Sea_Shanty/Le_Forban_version_de_mer_.sg",
-    "Sea_Shanty/Le_Forban_version_de_terre_.sg",
-    "Sea_Shanty/The_Mermaid.sg",
-    "Sea_Shanty/John_Kanak.sg",
-    "Steven_and_Peter_Jones/Kilkelly_Ireland.sg",
+    "Percy_French/Eileen_Og.sg",
+    "Traditional/Eireann_Mo_Ghra_Mo_Chroi.sg",
+    "Traditional/Farewell_to_Tchernobyl.sg",
+    "Traditional/Fields_of_Athenrye.sg",
+    "Traditional/Finnegan_s_Wake.sg",
+    "Traditional/Finnish_Polka.sg",
+    "Traditional/Galway_Races.sg",
+    "Traditional/Glasgow_s_Reel.sg",
    "Traditional/Irish_Rover.sg",
+    "Traditional/Joe_Cooley_s_Reel.sg",
+    "Sea_Shanty/John_Kanak.sg",
    "Traditional/Johnny_I_Harldy_Knew_Ye_.sg",
+    "Traditional/John_Ryan_s_Polka.sg",
+    "Traditional/Kerry.sg",
+    "Traditional/Kerry_Polka.sg",
+    "Traditional/Kesh_Jig.sg",
+    "Steven_and_Peter_Jones/Kilkelly_Ireland.sg",
+    "Traditional/King_of_The_Fairies.sg",
+    "Traditional/Leaving_of_Liverpool.sg",
+    "Sea_Shanty/Le_Forban_version_de_mer_.sg",
+    "Sea_Shanty/Le_Forban_version_de_terre_.sg",
+    "Traditionnel/Les_Filles_des_Forges.sg",
    "Traditional/Les_Prisons_de_Nantes.sg",
+    "Traditional/Magpie_s_Nest.sg",
+    "Traditional/Molly_Maguires.sg",
+    "Traditional/Morrison_s_Jig.sg",
+    "Jean_Schwartz/My_Irish_Molly_O.sg",
+    "Traditional/Paddy_s_Return.sg",
+    "Traditional/Pride_of_Petravore.sg",
+    "Traditional/Rare_Old_Times.sg",
+    "Traditional/Rights_of_Man.sg",
    "Traditional/Rocky_Road_To_Dublin.sg",
+    "Traditional/Sally_Brown.sg",
+    "Traditional/Star_of_The_County_Down.sg",
+    "Traditional/The_Foggy_Dew.sg",
    "Traditional/The_Furze_in_Bloom_jig_.sg",
    "Traditional/The_Jug_of_Punch.sg",
-    "Traditional/Whiskey_In_The_Jar.sg",
-    "Traditional/Whiskey_You_re_the_Devil.sg",
-    "Traditional/Kesh_Jig.sg",
-    "Traditional/Blackthorn_Stick.sg",
-    "Traditional/Kerry_Polka.sg",
-    "Traditional/Britches_Full_Of_Stitches.sg",
-    "Traditional/Finnish_Polka.sg",
-    "Traditional/Morrison_s_Jig.sg",
-    "Traditional/Joe_Cooley_s_Reel.sg",
-    "Traditional/Drowsy_Maggie.sg",
-    "Traditional/Glasgow_s_Reel.sg",
-    "Traditional/Rights_of_Man.sg",
-    "Traditional/Pride_of_Petravore.sg",
-    "Traditional/Paddy_s_Return.sg",
+    "Marc_Gunn/The_Leprechaun.sg",
+    "Sea_Shanty/The_Mermaid.sg",
+    "Traditional/The_Wild_Rover.sg",
+    "Traditionnel/Tri_Martolod.sg",
    "Traditional/Up_In_The_Air.sg",
-    "Traditional/Cliffs_of_Moher.sg",
-    "Traditional/Farewell_to_Tchernobyl.sg",
-    "Traditional/Magpie_s_Nest.sg",
-    "Traditional/Chattering_Magpie.sg",
-    "Traditional/Kerry.sg",
    "Traditional/Wedding_Polka.sg",
-    "Traditional/Castleisland_Polka.sg",
-    "Traditional/John_Ryan_s_Polka.sg",
-    "Traditional/The_Wild_Rover.sg",
-    "Traditional/The_Foggy_Dew.sg",
-    "Traditional/Molly_Maguires.sg",
-    "Traditional/Rare_Old_Times.sg",
-    "Traditional/Leaving_of_Liverpool.sg",
-    "Traditional/Finnegan_s_Wake.sg",
    "Traditional/Weile_Weile_Waile.sg",
-    "Traditional/Star_of_The_County_Down.sg",
-    "Traditional/King_of_The_Fairies.sg",
-    "Traditional/Fields_of_Athenrye.sg",
-    "Traditional/Eireann_Mo_Ghra_Mo_Chroi.sg",
-    "Traditional/Black_Velvet_Band.sg",
-    "Traditional/Galway_Races.sg",
-    "Traditional/Sally_Brown.sg",
-    "Traditionnel/Derobee_de_Guigamp.sg",
-    "Traditionnel/Les_Filles_des_Forges.sg",
-    "Traditionnel/Tri_Martolod.sg",
-    "Unknown/Bugger_Off.sg"
+    "Traditional/Whiskey_In_The_Jar.sg",
+    "Traditional/Whiskey_You_re_the_Devil.sg"
  ]
 }
--- a/songbook.tex
+++ b/songbook.tex
@ -50,79 +50,79 @@
 \set@picturecopyright{WTFPL - Do What The Fuck You Want Public License}
 \set@mail{benjamin.coudrin@gmail.com}
 \set@bookoptions{lilypond}
-\set@indexbgcolor{D1E4AE}
+\set@indexbgcolor{BA8D5A}
 \set@songslist{\graphicspath{
-  {songs/Steven_and_Peter_Jones/},
  {songs/Ewan_McColl/},
  {songs/Traditional/},
  {songs/Traditionnel/},
+  {songs/Jean_Schwartz/},
  {songs/Unknown/},
  {songs/Leon_Rosselson/},
-  {songs/Jean_Schwartz/},
+  {songs/Steven_and_Peter_Jones/},
  {img//},
  {songs/Percy_French/},
  {songs/Sea_Shanty/},
  {songs/Marc_Gunn/},
 }
+\input{songs/Sea_Shanty/15_Marins.sg}
+\input{songs/Traditional/Blackthorn_Stick.sg}
+\input{songs/Traditional/Black_Velvet_Band.sg}
+\input{songs/Traditional/Britches_Full_Of_Stitches.sg}
+\input{songs/Unknown/Bugger_Off.sg}
+\input{songs/Traditional/Castleisland_Polka.sg}
+\input{songs/Traditional/Chattering_Magpie.sg}
+\input{songs/Traditional/Cliffs_of_Moher.sg}
+\input{songs/Traditionnel/Derobee_de_Guigamp.sg}
 \input{songs/Ewan_McColl/Dirty_Old_Town.sg}
-\input{songs/Jean_Schwartz/My_Irish_Molly_O.sg}
 \input{songs/Leon_Rosselson/Don_t_Get_Married_Girls.sg}
-\input{songs/Marc_Gunn/The_Leprechaun.sg}
-\input{songs/Percy_French/Eileen_Og.sg}
-\input{songs/Sea_Shanty/15_Marins.sg}
+\input{songs/Traditional/Drowsy_Maggie.sg}
 \input{songs/Sea_Shanty/Drunken_Sailor.sg}
-\input{songs/Sea_Shanty/Le_Forban_version_de_mer_.sg}
-\input{songs/Sea_Shanty/Le_Forban_version_de_terre_.sg}
-\input{songs/Sea_Shanty/The_Mermaid.sg}
-\input{songs/Sea_Shanty/John_Kanak.sg}
-\input{songs/Steven_and_Peter_Jones/Kilkelly_Ireland.sg}
+\input{songs/Percy_French/Eileen_Og.sg}
+\input{songs/Traditional/Eireann_Mo_Ghra_Mo_Chroi.sg}
+\input{songs/Traditional/Farewell_to_Tchernobyl.sg}
+\input{songs/Traditional/Fields_of_Athenrye.sg}
+\input{songs/Traditional/Finnegan_s_Wake.sg}
+\input{songs/Traditional/Finnish_Polka.sg}
+\input{songs/Traditional/Galway_Races.sg}
+\input{songs/Traditional/Glasgow_s_Reel.sg}
 \input{songs/Traditional/Irish_Rover.sg}
+\input{songs/Traditional/Joe_Cooley_s_Reel.sg}
+\input{songs/Sea_Shanty/John_Kanak.sg}
 \input{songs/Traditional/Johnny_I_Harldy_Knew_Ye_.sg}
+\input{songs/Traditional/John_Ryan_s_Polka.sg}
+\input{songs/Traditional/Kerry.sg}
+\input{songs/Traditional/Kerry_Polka.sg}
+\input{songs/Traditional/Kesh_Jig.sg}
+\input{songs/Steven_and_Peter_Jones/Kilkelly_Ireland.sg}
+\input{songs/Traditional/King_of_The_Fairies.sg}
+\input{songs/Traditional/Leaving_of_Liverpool.sg}
+\input{songs/Sea_Shanty/Le_Forban_version_de_mer_.sg}
+\input{songs/Sea_Shanty/Le_Forban_version_de_terre_.sg}
+\input{songs/Traditionnel/Les_Filles_des_Forges.sg}
 \input{songs/Traditional/Les_Prisons_de_Nantes.sg}
+\input{songs/Traditional/Magpie_s_Nest.sg}
+\input{songs/Traditional/Molly_Maguires.sg}
+\input{songs/Traditional/Morrison_s_Jig.sg}
+\input{songs/Jean_Schwartz/My_Irish_Molly_O.sg}
+\input{songs/Traditional/Paddy_s_Return.sg}
+\input{songs/Traditional/Pride_of_Petravore.sg}
+\input{songs/Traditional/Rare_Old_Times.sg}
+\input{songs/Traditional/Rights_of_Man.sg}
 \input{songs/Traditional/Rocky_Road_To_Dublin.sg}
+\input{songs/Traditional/Sally_Brown.sg}
+\input{songs/Traditional/Star_of_The_County_Down.sg}
+\input{songs/Traditional/The_Foggy_Dew.sg}
 \input{songs/Traditional/The_Furze_in_Bloom_jig_.sg}
 \input{songs/Traditional/The_Jug_of_Punch.sg}
-\input{songs/Traditional/Whiskey_In_The_Jar.sg}
-\input{songs/Traditional/Whiskey_You_re_the_Devil.sg}
-\input{songs/Traditional/Kesh_Jig.sg}
-\input{songs/Traditional/Blackthorn_Stick.sg}
-\input{songs/Traditional/Kerry_Polka.sg}
-\input{songs/Traditional/Britches_Full_Of_Stitches.sg}
-\input{songs/Traditional/Finnish_Polka.sg}
-\input{songs/Traditional/Morrison_s_Jig.sg}
-\input{songs/Traditional/Joe_Cooley_s_Reel.sg}
-\input{songs/Traditional/Drowsy_Maggie.sg}
-\input{songs/Traditional/Glasgow_s_Reel.sg}
-\input{songs/Traditional/Rights_of_Man.sg}
-\input{songs/Traditional/Pride_of_Petravore.sg}
-\input{songs/Traditional/Paddy_s_Return.sg}
+\input{songs/Marc_Gunn/The_Leprechaun.sg}
+\input{songs/Sea_Shanty/The_Mermaid.sg}
+\input{songs/Traditional/The_Wild_Rover.sg}
+\input{songs/Traditionnel/Tri_Martolod.sg}
 \input{songs/Traditional/Up_In_The_Air.sg}
-\input{songs/Traditional/Cliffs_of_Moher.sg}
-\input{songs/Traditional/Farewell_to_Tchernobyl.sg}
-\input{songs/Traditional/Magpie_s_Nest.sg}
-\input{songs/Traditional/Chattering_Magpie.sg}
-\input{songs/Traditional/Kerry.sg}
 \input{songs/Traditional/Wedding_Polka.sg}
-\input{songs/Traditional/Castleisland_Polka.sg}
-\input{songs/Traditional/John_Ryan_s_Polka.sg}
-\input{songs/Traditional/The_Wild_Rover.sg}
-\input{songs/Traditional/The_Foggy_Dew.sg}
-\input{songs/Traditional/Molly_Maguires.sg}
-\input{songs/Traditional/Rare_Old_Times.sg}
-\input{songs/Traditional/Leaving_of_Liverpool.sg}
-\input{songs/Traditional/Finnegan_s_Wake.sg}
 \input{songs/Traditional/Weile_Weile_Waile.sg}
-\input{songs/Traditional/Star_of_The_County_Down.sg}
-\input{songs/Traditional/King_of_The_Fairies.sg}
-\input{songs/Traditional/Fields_of_Athenrye.sg}
-\input{songs/Traditional/Eireann_Mo_Ghra_Mo_Chroi.sg}
-\input{songs/Traditional/Black_Velvet_Band.sg}
-\input{songs/Traditional/Galway_Races.sg}
-\input{songs/Traditional/Sally_Brown.sg}
-\input{songs/Traditionnel/Derobee_de_Guigamp.sg}
-\input{songs/Traditionnel/Les_Filles_des_Forges.sg}
-\input{songs/Traditionnel/Tri_Martolod.sg}
-\input{songs/Unknown/Bugger_Off.sg}}
+\input{songs/Traditional/Whiskey_In_The_Jar.sg}
+\input{songs/Traditional/Whiskey_You_re_the_Devil.sg}}
 \makeatother
 \documentclass[\getbooktype,\getbookoptions,\getmainfontsize]{crepbook}
 \usepackage[utf8]{inputenc}
--- a/songs/Jean_Schwartz/My_Irish_Molly_O.sg
+++ b/songs/Jean_Schwartz/My_Irish_Molly_O.sg
@ -2,5 +2,33 @@
 \songcolumns{2}
 \beginsong{My Irish Molly O}[by=Jean Schwartz]

+\beginverse
+\[Mim]Molly dear now did you hear the \[Sol]news that's\[Ré]going \[Mim]round
+Down in a corner of my heart a love is \[Sol]what you've \[Ré]found
+\[Mim]Every time I look into your \[Sol]Irish \[Ré]eyes so \[Mim]blue
+They seem to whisper "Darling boy, my \[Sol]love is \[Ré]all for \[Mim]you"
+\endverse
+
+\beginchorus
+\[Ré]Oh, \[Sol]Molly, my Irish Molly, my sweet achusla \[Lam]dear
+I'm \[Si7]fairly off my \[Mim]trolley, my Irish \[Lam]Molly when you are \[Ré]near
+\[Sol]Springtime you know is \[Ré]ringtime, come dear now don't be \[Si]slow
+\[Mim]Change your name, go out with game, 
+begorrah wouldn't I do the same \[Sol]my Irish \[Ré]Molly \[Sol]O
+\endchorus
+
+\beginverse
+Molly dear now did you hear I furnished up the flat
+Three little cosy rooms with bath and "welcome" on the mat
+It's five pounds down and two a week, we'll soon be out of debt
+It's all complete except they haven't brought the cradle yet
+\endverse
+
+\beginverse
+Molly dear and did you hear what all the neighbours say
+About the hundred sovereigns you have safely stowed away
+They say that's why I love you, Ah but Molly that's a shame
+If you had only ninety-nine, I'd love you just the same
+\endverse

 \endsong
--- a/songs/Traditional/Blackthorn_Stick.sg
+++ b/songs/Traditional/Blackthorn_Stick.sg
@ -2,5 +2,6 @@
 \songcolumns{2}
 \beginsong{Blackthorn Stick}[by=Traditional]

+\lilypond{blackthorne_stick}

 \endsong