fix booklet layout

bin/generate

@@ -6,5 +6,5 @@ for t in src/songs/*.typ; do
   base="$(basename $t .typ)"
   title="$(grep -oP '^\W*title\W*=\W*"\K.*(?="\W*$$)' src/songs/$base.ly)"
 
-  echo -en "#song(\"$title\", \"$base\")\n" >>build/songs.typ
+  echo -en "#song(\"$title\", \"$base\")\n#pagebreak()\n" >>build/songs.typ
 done

src/singalongs.typ

@@ -10,3 +10,9 @@
 #counter(page).update(1)
 #set page(numbering: "1")
 #include "/build/songs.typ"
+
+#set align(center + horizon)
+_êona zerza_ \
+_aruida sa_\
+_aya dhâom_ \
+_nurdra dhao_\

src/song.typ

@@ -1,6 +1,6 @@
 #let song(title, basename) = {
   hide(heading(title))
-  image("/build/songs/" + basename + ".svg")
+  image("/build/songs/" + basename + ".svg", width: 100%)
+  set align(center)
   include ("/src/songs/" + basename + ".typ")
-  pagebreak()
 }

src/songs/AuldLangSyne.typ

@@ -1,42 +1,38 @@
-#columns(2, gutter: 11pt)[
+Should auld acquaintance be forgot, \
+And never brought to mind? \
+Should auld acquaintance be forgot, \
+And days of auld lang syne? \
 
-  Should auld acquaintance be forgot, \
+_[Chorus] \
-  And never brought to mind? \
-  Should auld acquaintance be forgot, \
-  And days of auld lang syne? \
-
-  _[Chorus] \
 For auld lang syne, my dear, \
 For auld lang syne. \
 We'll take a cup o' kindness yet, \
 For auld lang syne._ \
 
-  And surely ye'll be your pint-stowp! \
+And surely ye'll be your pint-stowp! \
-  And surely I'll be mine! \
+And surely I'll be mine! \
-  And we'll take a cup o' kindness yet, \
+And we'll take a cup o' kindness yet, \
-  for auld lang syne. \
+for auld lang syne. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  We twa hae run about the braes \
+We twa hae run about the braes \
-  And pou'd the gowans fine. \
+And pou'd the gowans fine. \
-  We've wandered mony a weary foot, \
+We've wandered mony a weary foot, \
-  Sin' auld lang syne. \
+Sin' auld lang syne. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  We twa hae sported i' the burn, \
+We twa hae sported i' the burn, \
-  From morning sun till dine, \
+From morning sun till dine, \
-  But seas between us braid hae roared \
+But seas between us braid hae roared \
-  Sin' auld lang syne. \
+Sin' auld lang syne. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  And ther's a hand, my trusty friend, \
+And ther's a hand, my trusty friend, \
-  And gie's a hand o' thine; \
+And gie's a hand o' thine; \
-  We'll tak' a right good willie-waught, \
+We'll tak' a right good willie-waught, \
-  For auld lang syne. \
+For auld lang syne. \
 
-  _[Chorus]_
+_[Chorus]_
-
-]

src/songs/Buergerlied.typ

@@ -1,5 +1,4 @@
 #columns(2, gutter: 11pt)[
-
   Ob wir rote, gelbe Kragen \
   Helme oder Hüte tragen \
   Stiefel tragen oder Schuh \
@@ -48,5 +47,4 @@
   Alle, die dies Lied gesungen, \
   So die Alten, wie die Jungen, \
   Tun wir, tun wir was dazu. \
-
 ]

src/songs/DrunkenSailor.typ

@@ -1,56 +1,52 @@
-#columns(2, gutter: 11pt)[
+_[Chorus]
-
-  _[Chorus]
 Way-hey up she rises \
 Way-hey up she rises \
 Way-hey up she rises \
 Early in the morning!_
 
-  _What shall we do with a drunken sailor? \
+_What shall we do with a drunken sailor? \
 What shall we do with a drunken sailor? \
 What shall we do with a drunken sailor? \
 Earl-eye in the morning?_
 
-  Put him in a long-boat till he's sober \
+Put him in a long-boat till he's sober \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Keep him there and make 'im bale 'er. \
+Keep him there and make 'im bale 'er. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Trice him up in a runnin' bowline. \
+Trice him up in a runnin' bowline. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Put him in the scuppers with a hose-pipe on him. \
+Put him in the scuppers with a hose-pipe on him. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Take 'im and shake 'im and try an' wake i'm. \
+Take 'im and shake 'im and try an' wake i'm. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Give 'im a taste of the bosun's rope-end.
+Give 'im a taste of the bosun's rope-end.
 
-  _[Chorus]_
+_[Chorus]_
 
-  Shave his belly with a rusty razor. \
+Shave his belly with a rusty razor. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Put him in the bed with the captain's daughter. \
+Put him in the bed with the captain's daughter. \
 
-  _[Chorus]_
+_[Chorus]_
 
-  Way-hey up she rises \
+Way-hey up she rises \
-  Way-hey up she rises \
+Way-hey up she rises \
-  Way-hey up she rises \
+Way-hey up she rises \
-  Early in the morning! \
+Early in the morning! \
 
-  That's what we do with a drunken sailor \
+That's what we do with a drunken sailor \
-  That's what we do with a drunken sailor \
+That's what we do with a drunken sailor \
-  That's what we do with a drunken sailor \
+That's what we do with a drunken sailor \
-  Early in the morning! \
+Early in the morning! \
-
-]

src/songs/FoggyDew.typ

@@ -1,5 +1,4 @@
 #columns(2, gutter: 11pt)[
-
   As down the glen one Easter morn \
   To a city fair rode I \
   There armed lines of marching men \

src/songs/ImARoverSeldomSober.typ

@@ -1,43 +1,39 @@
-#columns(2, gutter: 11pt)[
+I'm a rover and seldom sober \
+I'm a rover, o' high degree; \
+And when I'm drinking, I'm always thinking \
+How to gain my love's company. \
 
-  I'm a rover and seldom sober \
+Though the night be dark as dungeon \
-  I'm a rover, o' high degree; \
+No' a star to be seen above, \
-  And when I'm drinking, I'm always thinking \
+I will be guided without a stumble \
-  How to gain my love's company. \
+Into the arms o' my ain true love. \
 
-  Though the night be dark as dungeon \
+He steppit up to her bedroom window, \
-  No' a star to be seen above, \
+Kneelin' gently upon a stone; \
-  I will be guided without a stumble \
+He rappit at her bedroom-window \
-  Into the arms o' my ain true love. \
+"Darlin' dear, do you lie alone?" \
 
-  He steppit up to her bedroom window, \
+She raised her head on her snow-white pillow \
-  Kneelin' gently upon a stone; \
+Wi' her arms aboot her breast, \
-  He rappit at her bedroom-window \
+"Wha' is that at my bedroom window \
-  "Darlin' dear, do you lie alone?" \
+Disturbin' me at my long night's rest?" \
 
-  She raised her head on her snow-white pillow \
+"It's only me, your ain true lover, \
-  Wi' her arms aboot her breast, \
+Open the door and let me in. \
-  "Wha' is that at my bedroom window \
+For I have come on a long journey, \
-  Disturbin' me at my long night's rest?" \
+And I'm near drenched to the skin." \
 
-  "It's only me, your ain true lover, \
+She opened the door wi' the greatest pleasure, \
-  Open the door and let me in. \
+She opened the door and let him in, \
-  For I have come on a long journey, \
+They baith shook hands and embraced each other \
-  And I'm near drenched to the skin." \
+Until the mornin' they lay as one. \
 
-  She opened the door wi' the greatest pleasure, \
+The cocks were crawin', the birds were whistlin' \
-  She opened the door and let him in, \
+The burns they ran free abune the brae; \
-  They baith shook hands and embraced each other \
+"Remember, lass, I'm a ploughman laddie \
-  Until the mornin' they lay as one. \
+And the farmer I must obey." \
 
-  The cocks were crawin', the birds were whistlin' \
+"Noo, my lass, I must gang and leave thee \
-  The burns they ran free abune the brae; \
+And though the hills they are high above, \
-  "Remember, lass, I'm a ploughman laddie \
+I will climb them wi' greater pleasure \
-  And the farmer I must obey." \
+Since I been in the arms o' my love. \
-
-  "Noo, my lass, I must gang and leave thee \
-  And though the hills they are high above, \
-  I will climb them wi' greater pleasure \
-  Since I been in the arms o' my love. \
-
-]

src/songs/KerryRecruit.typ

@@ -1,13 +1,12 @@
 #columns(2, gutter: 11pt)[
-
   About four years ago I was digging the land \
   With me brogues on me feet and me spade in me hand \
   Says I to me self, what a pity to see, \
   Such a fine strapping lad footing turf round Tralee \
 
   _[Chorus] \
-Wid me too ra na nya with me too ra na nya, \
+  Wid me too ra na nya with me too ra na nya, \
-Wid me too ra na noo ra na noo ra na nya_
+  Wid me too ra na noo ra na noo ra na nya_
 
   Well I buttered me brogues, an shook hands with me spade, \
   An the way down the road like a dashing young blade \

src/songs/WildRover.typ

@@ -1,35 +1,31 @@
-#columns(2, gutter: 11pt)[
+I've been a wild rover for many a year \
+And I've spent all my money on whiskey and beer, \
+And now I'm returning with gold and great store \
+And I never will play the wild rover no more \
 
-  I've been a wild rover for many a year \
+_[Chorus] \
-  And I've spent all my money on whiskey and beer, \
-  And now I'm returning with gold and great store \
-  And I never will play the wild rover no more \
-
-  _[Chorus] \
 And it's no, nay, never \
 No nay never no more \
 Will I play the wild rover \
 No never no more._
 
-  I went to an ale-house I used to frequent \
+I went to an ale-house I used to frequent \
-  And I told the landlady me money was spent. \
+And I told the landlady me money was spent. \
-  I asked her for credit, she answered me "nay \
+I asked her for credit, she answered me "nay \
-  Such a custom as yours I could have any day." \
+Such a custom as yours I could have any day." \
 
-  _[Chorus]_
+_[Chorus]_
 
-  I took from my pocket ten soverigns bright \
+I took from my pocket ten soverigns bright \
-  And the landlady's eyes opened wide with delight. \
+And the landlady's eyes opened wide with delight. \
-  She said "I have whiskey and wines of the best \
+She said "I have whiskey and wines of the best \
-  And the words that I spoke were only in jest." \
+And the words that I spoke were only in jest." \
 
-  _[Chorus]_
+_[Chorus]_
 
-  I'll go home to my parents, confess what I've done \
+I'll go home to my parents, confess what I've done \
-  And I'll ask them to pardon their prodigal son. \
+And I'll ask them to pardon their prodigal son. \
-  And if they forgive me as oftimes before \
+And if they forgive me as oftimes before \
-  Sure I never will play the wild rover no more. \
+Sure I never will play the wild rover no more. \
 
-  _[Chorus]_
+_[Chorus]_
-
-]