From 0b085baff8b383ad6e89691a5095edeeb243fed7 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 3 Jan 2021 12:47:49 -0300
Subject: Finish dengoso.ly

---
 TODOs.org        | 32 +++++++++++++++++++++++++++-----
 music/dengoso.ly | 53 +++++++++++++++++++++++++++--------------------------
 2 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/TODOs.org b/TODOs.org
index ed223ff..b609779 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -2,24 +2,38 @@
 :PROPERTIES:
 :CUSTOM_ID: tasks
 :END:
-** TODO =dengoso.ly= [8/11]
+** DONE =dengoso.ly= [9/10]
+CLOSED: [2021-01-03 dim. 12:46]
 :PROPERTIES:
 :CUSTOM_ID: 95ac1eec-1a56-47cb-b7ad-8cadf5737323
 :END:
+- State "DONE"       from "TODO"       [2021-01-03 dim. 12:46]
 - State "TODO"       from              [2021-01-01 ven. 22:23]
 
 - [X] use "<quarter> = 100" over "Andante moderato for =meter=
 - [X] turn =cWithSlash= into a function
 - [X] move =pestana== into shared =pestana.ly=
 - [X] +use fret-number over roman string on =\pestana #"II" { }=+
-- [ ] measures 21~24: map previous notes, removing fingering notation instead of
-  repeating notes
 - [X] =\6 to D= on beginning of the song
 - [X] share notes between voices
 - [X] add string markers
 - [X] pestana over rests (measure 42)
-- [ ] handle optional sharp on measure 77
-- [ ] add torrent for audio (and PDF?)
+- [X] handle optional sharp on measure 77
+** TODO Embed LilyPond source code in PDF and audio
+:PROPERTIES:
+:CUSTOM_ID: 340da973-622c-45d6-8d3c-7db839586517
+:END:
+- State "TODO"       from              [2021-01-03 dim. 12:46]
+
+Use the =embed-source-code= options:
+: #(ly:set-option 'embed-source-code #t)
+** TODO Add torrent for audio in =music-listing.html=
+:PROPERTIES:
+:CUSTOM_ID: aa314475-6a19-48fe-a752-7c479ad26be2
+:END:
+- State "TODO"       from              [2021-01-03 dim. 12:46]
+
+Torrent for PDF, too?
 ** TODO Generate =favicon.ico= from =favicon.svg=
 :PROPERTIES:
 :CUSTOM_ID: 720e79b4-9e38-41c6-9958-cdadd67d2298
@@ -153,6 +167,14 @@ Ressurect the WebM file when experimenting with:
 :CUSTOM_ID: bugs
 :END:
 * Improvements
+** TODO =dengoso.ly= [0/1]
+:PROPERTIES:
+:CUSTOM_ID: fd989cc2-b638-4943-8109-b8e3cac0aae1
+:END:
+- State "TODO"       from              [2021-01-03 dim. 12:44]
+
+- [ ] measures 21~24: map previous notes, removing fingering notation instead of
+  repeating notes
 * Questions
 ** DONE Why insist on having =.ogg= files, but not the same for video?
 CLOSED: [2020-12-24 jeu. 20:47]
diff --git a/music/dengoso.ly b/music/dengoso.ly
index 9b872cb..d3ba0ff 100644
--- a/music/dengoso.ly
+++ b/music/dengoso.ly
@@ -62,25 +62,25 @@ upper = \relative c {
     { d, \pestanaSpan "II" a''\startTextSpan d fis g fis g gis\stopTextSpan | }
     { r4 \pestanaSingle "VII" <d fis d'> | }
   }
-  
+
   \repeat volta 2 {
     \key d \minor
-    
+
     <a-3>16 a <d-4 f-2> a a a <d f> a |
     <g-3> g <bes-1 e-4> g g g <bes e> g |
     <f-3> f <a-2 d-4> f f f <a d> f |
     r <g-0 cis-2> <g cis> e' r <bes-3>( <a-2>) <g-0> |
-   
+
     <fis-4> <c-3> <dis-1>( <fis-4>) <a-2> <fis-4> c' a |
     <d-4> <bes-3>( <g-0>) <d-0> <g-0> <d-0> <bes'-3>( <g-0>) |
     <gis-1> <d-0> <b'-9> <gis-1> <d'-4>( <b-0>) <f'-4\2>( <d-1>) |
     <bes'-2>( <a-1>) <g-4> <f-2> <e-1> <d-3> <cis-2> <bes-4\4> |
-    
+
     <a-3> a <d-4 f-2> a a a <d f> a |
     <g-3> g <bes-1 e-4> g g g <bes e> g |
     \pestanaSpan "III" f,\startTextSpan f <bes' d> f, f f <bes' d> f,\stopTextSpan |
     \pestanaSpan "II" r\startTextSpan <a' cis> <a cis>( e')~ e4\stopTextSpan
-    
+
     \pestanaSpan "III" <bes-1>16(\startTextSpan <c-4>) <d-1> <e-4> <f-4>\stopTextSpan <g-1> <a-3> <bes-4> |
     <bes-4>( <a-3>) <gis-2> <a-3> <d-4>( <bes-1>) <g-3> <e-0> |
     <f-1> <d-4> <a-2> <f-3> <e-1> <cis'-2> <g-0> <e-1>
@@ -89,7 +89,7 @@ upper = \relative c {
     { r <g-0> <gis-1> <a-2> r <bes-3> <a-2> <g-0> | }
     { r4 \pestanaSingle "X" <f' a d> | }
   }
-  
+
   \key d \major
   \pestanaSpan "V" a16\startTextSpan <a, d>8 <a d>16 r16 g'8 fis16 |
   a16 <g, cis>8 <g cis>16 r16 cis fis cis\stopTextSpan |
@@ -109,30 +109,31 @@ upper = \relative c {
   d'16 <fis, a>8 <fis a>16 dis'8 <fis, a> |
   e'8 <b d>16 <ais cis> <g b e> d'( b) g |
   fis d' a fis e cis' g e
-  r4 \pestanaSingle "VII" <d' fis d'> | 
+  r4 \pestanaSingle "VII" <d' fis d'> |
   \bar "||"
-  
+
   \key d \minor
   <f-2>16 <a,-3 d-4>8 <a d>16 f'8 <a, d> |
   <e'-4>16 <g,-3 bes-1>8 <g bes>16 <d'-4>8 <f,-3 a-2> |
   <cis'-4>16 <e,-3 g-0>8 <e g>16 <f'-1>8 <g, cis> |
   <e'-0>16 <g,-0 cis-4>8 <g cis>16 <d'-4>8 <f,-3 a-2> |
-  
-  <f'-2>16 <a,-3 d-4>8 <a d>16 f'8 <a, d> | 
+
+  <f'-2>16 <a,-3 d-4>8 <a d>16 f'8 <a, d> |
   \pestanaSpan "V" <e'-1>16\startTextSpan <a,-3 c-1>8 <a c>16 a,8 <a' c> |
   <a-3>16 <c-1> <a'-4> c,\stopTextSpan <aes-3> <b-1> <b'-4> b, |
   \pestanaSpan "V" <a-3>\startTextSpan <c-1> <a'-1> c, a c a' c,\stopTextSpan |
-  
+
   <f-2> <a,-3 d-4>8 <a d>16 f'8 <a, d> |
   f'16 <a, d>8 <a d>16 <e'-1>8 <a,-3 cis-2> |
   \pestanaSpan "III" <g'-1>16\startTextSpan <bes,-1 e-3>8 <bes e>16 g'8 <bes, e> |
   g'16 <bes, e>8 <bes e>16\stopTextSpan \pestanaSpan "V" <a'-1>8\startTextSpan <c,-1 fis-3>\stopTextSpan |
-  
+
   \pestanaSpan "V" <bes'-2>16\startTextSpan <d,-3 g-4>8 <d g>16 <d g> <a'-1>8 <g-4>16 |
   <f-2> <a,-3 d-4>8 <a d>16 <a d> <e'-0>8 <d-4>16 |
-  <c-2> <a-3>8 a16 a <f'-2>8 <e-1>16 |
+  <c-2>^"[#]"
+  <a-3>8 a16 a <f'-2>8 <e-1>16 |
   <d-4> <a-3>8 a16 a a8 a16\stopTextSpan |
-  
+
   \key d \major
   \pestanaSpan "V" a'16\startTextSpan <a, d>8 <a d>16 r16 g'8 fis16 |
   a16 <g, cis>8 <g cis>16 r16 cis fis cis\stopTextSpan |
@@ -152,7 +153,7 @@ upper = \relative c {
   d'16 <fis, a>8 <fis a>16 dis'8 <fis, a> |
   e'8 <b d>16 <ais cis> <g b e> d'( b) g |
   fis d' a fis e cis' g e
-  r4 \pestanaSingle "VII" <d' fis d'> | 
+  r4 \pestanaSingle "VII" <d' fis d'> |
   \bar "|."
 }
 
@@ -199,25 +200,25 @@ lower = \relative c {
     { d,2 | }
     { d8 a' d4 | }
   }
-    
+
   \repeat volta 2 {
     \key d \minor
-    
+
     a'16\4 a8 a16 a a8 a16 |
     g\4 g8 g16 g g8 g16 |
     f f8 f16 f f8 f16 |
     e4 a, |
-    
+
     r2 |
     d8. r16 r4 |
     r2 |
     a2 |
-    
+
     a'16 a8 a16 a a8 a16 |
     g g8 g16 g g8 g16 |
     f, f8 f16 f f8 f16 |
     e4 r16 <e-1>( <f-2>) <fis-3> |
-    
+
     g4 r4 |
     d g' |
     d8. f16 e8. e16 |
@@ -226,7 +227,7 @@ lower = \relative c {
     { d4 r | }
     { d8 a d4 | }
   }
-  
+
   \key d \major
   d,4 dis' |
   <e> g, |
@@ -247,28 +248,28 @@ lower = \relative c {
   <e>8 r8 r4 |
   fis'8. fis16 e8. e16 |
   d,8 a' d4 |
-  
+
   \key d \minor
   d,4 d |
   a' a |
   a a |
   a d, |
-  
+
   d d |
   a' a |
   a' aes |
   a a |
-  
+
   d,, d |
   d a' |
   a a |
   a d |
-  
+
   <g-1> r |
   d, r |
   a'2 |
   d, |
-  
+
   \key d \major
   d4 dis' |
   e g, |
-- 
cgit v1.2.3