2 files changed, 24 insertions, 17 deletions

diff --git a/TODOs.org b/TODOs.org
index 47a88e9..f916be0 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -2,6 +2,19 @@
 :PROPERTIES:
 :CUSTOM_ID: tasks
 :END:
+** TODO =dengoso.ly= [0/6]
+:PROPERTIES:
+:CUSTOM_ID: 95ac1eec-1a56-47cb-b7ad-8cadf5737323
+:END:
+- State "TODO"       from              [2021-01-01 ven. 22:23]
+
+- [ ] use "<quarter> = 100" over "Andante moderato for =meter=
+- [ ] turn =cWithSlash= into a function
+- [ ] move =pestana== into shared =pestana.ly=
+- [ ] use fret-number over roman string on =\pestana #"II" { }=
+- [ ] measures 21~24: map previous notes, removing fingering notation instead of
+  repeating notes
+- [ ] =\6 to D= on beginning of the song
 ** DONE Move =assert-content.sh= to Ruby
 CLOSED: [2020-12-24 jeu. 18:47]
 :PROPERTIES:
diff --git a/music/dengoso.ly b/music/dengoso.ly
index 158d05b..d949604 100644
--- a/music/dengoso.ly
+++ b/music/dengoso.ly
@@ -3,7 +3,7 @@
 \header {
   title = "Dengoso"
   composer = "João Pernambuco"
-  meter = "Andante moderato" % FIXME
+  meter = "Andante moderato"
   copyright = \markup {
     \with-url #"https://creativecommons.org/licenses/by-sa/4.0/" \line {
       CC BY-SA 4.0
@@ -16,15 +16,11 @@
   }
 }
 
-% \include "pestana.ly"
-% FIXME: turn into a function
 cWithSlash = \markup {
-  \fontsize #-2 
+  \fontsize #-2
   \combine \roman C \translate #'(0.6 . -0.4) \draw-line #'(0 . 2.0)
 }
 
-% FIXME
-% str -> fret-number
 pestana =
 #(define-music-function (barre location str music) (string? ly:music?)
    (let ((elts (extract-named-music music '(NoteEvent EventChord))))
@@ -84,20 +80,19 @@ upper = \relative c {
     }
     <a-1 e'-0>16 <a d>8 <a cis>16^\markup { \cWithSlash \fontsize #-2 II } <a b>8 a |
     <b-0>16 <cis,-3 g'-4>8 <cis g'>16 \pestana #"II" { cis'8 <g a> } |
-    
+
     <d'-2>16 <fis,-3 a-1>8 <fis a>16 <fis'-4>8 <a,-3 c-2> |
     <e'-0>16 <a,-2 cis-3>8 <a cis>16 r16 <g-0> <cis-3> <e-0> |
     <d gis d'>16 <d gis d'>8 <d gis d'>16 <d gis cis>8 <d gis b> |
     <e'-4>16 <cis,-2 g'-3>8 <cis g'>16 <cis g' b>8 <cis-2 g'-3 a-1> |
-    
-    % FIXME: map previous notes, removing fingering notation
+
     \pestana #"V" {
       a'16 <a, d>8 <a d>16 r16 <g'>8 <fis>16 |
       a16 <g, cis>8 <g cis>16 r16 <cis> <fis> <cis> |
     }
     <a e'>16 <a d>8 <a cis>16^\markup { \cWithSlash \fontsize #-2 II } <a b>8 a |
     <b>16 <cis, g'>8 <cis g'>16 \pestana #"II" { cis'8 <g a> } |
-    
+
     d'16 <fis, a>8 <fis a>16 dis'8 <fis, a> |
     <e'-0>8 <b-3 d-2>16 <ais-2 cis-1> <g b e> <d'-2>( <b-0>) <g-0> |
     <fis-3> <d'-2> <a-1> <fis-3> <e-1> <cis'-2> <g-0> <e-1>
@@ -112,7 +107,6 @@ upper = \relative c {
 lower = \relative c {
   \globals
 
-  % FIXME: \6 to D
   r2 |
   r8 a r a |
   r8 a r a |
@@ -127,29 +121,29 @@ lower = \relative c {
   a a8 b16 cis b8 a16
   d,4. a''16 a,~ |
   a a8 b16 cis b8 a16 |
-  
+
   \repeat volta 2 {
     d,4 dis' |
     <e-3> g, |
     <fis'-3>16 fis8 fis16 fis8 fis |
     e,4 cis' |
-    
+
     d, dis |
     <e-1> <ais-1> |
     e' e |
     a, r4 |
-    
+
     d, <dis'-2> |
     e g, |
     fis'16 fis8 fis16 fis8 fis |
     e,4 cis' |
-    
+
     d, fis |
     <e-4>8 r8 r4 |
     fis'8. fis16 e8. e16 |
   }
   \alternative {
-    { d,2 | } 
+    { d,2 | }
     { d8 a' d4 | }
   }
 }
@@ -159,7 +153,7 @@ staff = \new Staff <<
   \\
   \lower
 >>
-  
+
 \score {
   \staff
   \layout { }