Start work on "marcha-dos-marinheiros.ly"

2 files changed, 45 insertions, 12 deletions

diff --git a/TODOs.org b/TODOs.org
index 09b5c4e..d32561c 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -39,6 +39,11 @@ CLOSED: [2021-01-03 dim. 12:46]
   \cadenzaOff
   \startStaff
   #+END_SRC
+** TODO =marcha-dos-marinheiros.ly= [/]
+:PROPERTIES:
+:CUSTOM_ID: bbc19f19-ca4f-4cbf-bc4d-e119ad06deef
+:END:
+- State "TODO"       from              [2021-01-03 dim. 19:26]
 ** TODO Embed LilyPond source code in PDF and audio
 :PROPERTIES:
 :CUSTOM_ID: 340da973-622c-45d6-8d3c-7db839586517
diff --git a/music/marcha-dos-marinheiros.ly b/music/marcha-dos-marinheiros.ly
index 78411da..f654298 100644
--- a/music/marcha-dos-marinheiros.ly
+++ b/music/marcha-dos-marinheiros.ly
@@ -1,27 +1,22 @@
 \version "2.20.0"
 \pointAndClickOff
 
+\include "common.ly"
+\include "guitar.ly"
+
 \header {
   title = "Marcha dos Marinheiros"
   composer = "Canhoto"
-  copyright = \markup {
-    \with-url #"https://creativecommons.org/licenses/by-sa/4.0/" \line {
-      CC BY-SA 4.0
-    }
-  }
-  tagline = \markup {
-    \with-url #"https://euandre.org/music.html" \line {
-      euandre.org/music.html
-    }
-  }
+  copyright = \copyright
+  tagline = \tagline
 }
 
 globals = {
   \clef "treble_8"
-  \key d \major
+  \key a \minor
   \time 2/4
   \set fingeringOrientations = #'(left)
-  \tempo 4 = 100
+  \tempo Adagio 4 = 70
 }
 
 upper = \relative c {
@@ -30,6 +25,39 @@ upper = \relative c {
 
 lower = \relative c {
   \globals
+  \set stringNumberOrientations = #'(down)
+
+  d4~ d16 <b-2> <c-3> <d-0> |
+  <e-2>4~ e16 <a,-0> <b-2> <c-3> |
+  d4~ d16 <gis,-4> <a-0> <b-2> |
+  <c-4>4 a8 e |
+
+  d'4~ d16 <b-2> <c-3> <d-0> |
+  <e-2>4~ e16 e <d-0> <c-4> |
+  <e-2>8 <d-0> <c-4> <b-2> |
+  a4~ a16 e' ees d |
+
+  \repeat volta 2 {
+    \mark \markup { \musicglyph #"scripts.segno" }
+    <c-4>4 <b-2>8 <e,-0> |
+    <a-0>4~ a16 <a'-2> <aes-1> <g-0> |
+    <f-3>4 <e-1>8 <a,-0> ||
+    <d-0>4~ d16 d e f |
+
+    d'8 c b a |
+  }
+  \alternative {
+    {
+      gis4~ gis16 d e f |
+      e8 d c b |
+      a4~ a16 e' ees d |
+    }
+    {
+      c'8 b a f |
+      e d c b |
+      a2 |
+    }
+  }
 }
 
 staff = \new Staff <<