From 5135de5e11d3c16996e1cb83a323be64bf5c66a2 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 17 Jan 2025 11:14:15 +0100 Subject: [PATCH] fix booklet layout --- bin/generate | 2 +- src/singalongs.typ | 6 +++ src/song.typ | 4 +- src/songs/AuldLangSyne.typ | 54 ++++++++++++------------ src/songs/Buergerlied.typ | 2 - src/songs/DrunkenSailor.typ | 56 ++++++++++++------------- src/songs/FoggyDew.typ | 1 - src/songs/ImARoverSeldomSober.typ | 68 +++++++++++++++---------------- src/songs/KerryRecruit.typ | 5 +-- src/songs/WildRover.typ | 44 +++++++++----------- 10 files changed, 114 insertions(+), 128 deletions(-) diff --git a/bin/generate b/bin/generate index e0365e4..dbe70dc 100755 --- a/bin/generate +++ b/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 diff --git a/src/singalongs.typ b/src/singalongs.typ index ab786f7..7a3e499 100644 --- a/src/singalongs.typ +++ b/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_\ diff --git a/src/song.typ b/src/song.typ index 397d8d6..97f9db0 100644 --- a/src/song.typ +++ b/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() } diff --git a/src/songs/AuldLangSyne.typ b/src/songs/AuldLangSyne.typ index b6cf5bd..8d095d5 100644 --- a/src/songs/AuldLangSyne.typ +++ b/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, \ - And never brought to mind? \ - Should auld acquaintance be forgot, \ - And days of auld lang syne? \ - - _[Chorus] \ +_[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 I'll be mine! \ - And we'll take a cup o' kindness yet, \ - for auld lang syne. \ +And surely ye'll be your pint-stowp! \ +And surely I'll be mine! \ +And we'll take a cup o' kindness yet, \ +for auld lang syne. \ - _[Chorus]_ +_[Chorus]_ - We twa hae run about the braes \ - And pou'd the gowans fine. \ - We've wandered mony a weary foot, \ - Sin' auld lang syne. \ +We twa hae run about the braes \ +And pou'd the gowans fine. \ +We've wandered mony a weary foot, \ +Sin' auld lang syne. \ - _[Chorus]_ +_[Chorus]_ - We twa hae sported i' the burn, \ - From morning sun till dine, \ - But seas between us braid hae roared \ - Sin' auld lang syne. \ +We twa hae sported i' the burn, \ +From morning sun till dine, \ +But seas between us braid hae roared \ +Sin' auld lang syne. \ - _[Chorus]_ +_[Chorus]_ - And ther's a hand, my trusty friend, \ - And gie's a hand o' thine; \ - We'll tak' a right good willie-waught, \ - For auld lang syne. \ +And ther's a hand, my trusty friend, \ +And gie's a hand o' thine; \ +We'll tak' a right good willie-waught, \ +For auld lang syne. \ - _[Chorus]_ - -] +_[Chorus]_ diff --git a/src/songs/Buergerlied.typ b/src/songs/Buergerlied.typ index bc363d4..4b34a7f 100644 --- a/src/songs/Buergerlied.typ +++ b/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. \ - ] diff --git a/src/songs/DrunkenSailor.typ b/src/songs/DrunkenSailor.typ index d045f7b..fa5b027 100644 --- a/src/songs/DrunkenSailor.typ +++ b/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 \ - Early in the morning! \ +Way-hey up she rises \ +Way-hey up she rises \ +Way-hey up she rises \ +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 \ - 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 \ +Early in the morning! \ diff --git a/src/songs/FoggyDew.typ b/src/songs/FoggyDew.typ index 6db797d..ba97336 100644 --- a/src/songs/FoggyDew.typ +++ b/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 \ diff --git a/src/songs/ImARoverSeldomSober.typ b/src/songs/ImARoverSeldomSober.typ index 220e71b..8cf6d56 100644 --- a/src/songs/ImARoverSeldomSober.typ +++ b/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 \ - I'm a rover, o' high degree; \ - And when I'm drinking, I'm always thinking \ - How to gain my love's company. \ +Though the night be dark as dungeon \ +No' a star to be seen above, \ +I will be guided without a stumble \ +Into the arms o' my ain true love. \ - Though the night be dark as dungeon \ - No' a star to be seen above, \ - I will be guided without a stumble \ - Into the arms o' my ain true love. \ +He steppit up to her bedroom window, \ +Kneelin' gently upon a stone; \ +He rappit at her bedroom-window \ +"Darlin' dear, do you lie alone?" \ - He steppit up to her bedroom window, \ - Kneelin' gently upon a stone; \ - He rappit at her bedroom-window \ - "Darlin' dear, do you lie alone?" \ +She raised her head on her snow-white pillow \ +Wi' her arms aboot her breast, \ +"Wha' is that at my bedroom window \ +Disturbin' me at my long night's rest?" \ - She raised her head on her snow-white pillow \ - Wi' her arms aboot her breast, \ - "Wha' is that at my bedroom window \ - Disturbin' me at my long night's rest?" \ +"It's only me, your ain true lover, \ +Open the door and let me in. \ +For I have come on a long journey, \ +And I'm near drenched to the skin." \ - "It's only me, your ain true lover, \ - Open the door and let me in. \ - For I have come on a long journey, \ - And I'm near drenched to the skin." \ +She opened the door wi' the greatest pleasure, \ +She opened the door and let him in, \ +They baith shook hands and embraced each other \ +Until the mornin' they lay as one. \ - She opened the door wi' the greatest pleasure, \ - She opened the door and let him in, \ - They baith shook hands and embraced each other \ - Until the mornin' they lay as one. \ +The cocks were crawin', the birds were whistlin' \ +The burns they ran free abune the brae; \ +"Remember, lass, I'm a ploughman laddie \ +And the farmer I must obey." \ - The cocks were crawin', the birds were whistlin' \ - The burns they ran free abune the brae; \ - "Remember, lass, I'm a ploughman laddie \ - And the farmer I must obey." \ - - "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. \ - -] +"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. \ diff --git a/src/songs/KerryRecruit.typ b/src/songs/KerryRecruit.typ index 258c5bf..21b38d0 100644 --- a/src/songs/KerryRecruit.typ +++ b/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 noo ra na noo 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_ Well I buttered me brogues, an shook hands with me spade, \ An the way down the road like a dashing young blade \ diff --git a/src/songs/WildRover.typ b/src/songs/WildRover.typ index 5655212..98cac4a 100644 --- a/src/songs/WildRover.typ +++ b/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 \ - 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] \ +_[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 \ - And I told the landlady me money was spent. \ - I asked her for credit, she answered me "nay \ - Such a custom as yours I could have any day." \ +I went to an ale-house I used to frequent \ +And I told the landlady me money was spent. \ +I asked her for credit, she answered me "nay \ +Such a custom as yours I could have any day." \ - _[Chorus]_ +_[Chorus]_ - I took from my pocket ten soverigns bright \ - And the landlady's eyes opened wide with delight. \ - She said "I have whiskey and wines of the best \ - And the words that I spoke were only in jest." \ +I took from my pocket ten soverigns bright \ +And the landlady's eyes opened wide with delight. \ +She said "I have whiskey and wines of the best \ +And the words that I spoke were only in jest." \ - _[Chorus]_ +_[Chorus]_ - I'll go home to my parents, confess what I've done \ - And I'll ask them to pardon their prodigal son. \ - And if they forgive me as oftimes before \ - Sure I never will play the wild rover no more. \ +I'll go home to my parents, confess what I've done \ +And I'll ask them to pardon their prodigal son. \ +And if they forgive me as oftimes before \ +Sure I never will play the wild rover no more. \ - _[Chorus]_ - -] +_[Chorus]_