Merge pull request 'Necrofantasia finger positions, Broken Moon' (#3) from game/touhou into main

Reviewed-on: #3

game/broken-moon.ly

@@ -0,0 +1,84 @@
+\version "2.24.0"
+\language "english"
+\header {
+	title = "Broken Moon (Incomplete Version)"
+	composer = "ZUN"
+	poet = "Transcribed by Nekorare, Leni Aniva"
+}
+violin = \new Staff \with {
+	instrumentName = "Violin"
+	shortInstrumentName = "V."
+	midiInstrument = "violin"
+}
+\fixed c'' {
+	\tempo 4 = 83
+	\numericTimeSignature
+	\time 4/4
+	\override Accidental.hide-tied-accidental-after-break = ##t
+	\key c \minor
+
+	r2                   f4-4     g-1    | bf8-3    c'-4 g  f  g    c   ef f  |
+	<bf, d> ef <g, d> bf, <g, c>4 g,8 bf,| <af, c> ef f  ef <bf, f>4 f8 ef |
+	f      bf <ef g>2           g8  bf  | <ef c'> c' bf c' g4   <d g>8 ef |
+	f      g  f      ef  c4     c8  bf, | <af, c>4 <af, c>8 ef <bf, f> ef <d f> g |
+	<ef, c>2             <g, c>4 c8 d   |
+	\tempo 4 = 95
+	                                      ef4.          g8 f    ef  d  ef |
+	\tempo 4 = 100
+	c4.       d8  ef4.              c8  | <d f>4. ef8 f \tuplet 3/2 {ef16 f ef} f8 g |
+	g4.       f16 g <d g>4 8    c16 d   |
+	\tempo 4 = 103
+	                                      <c ef>4. g8 f ef f g |
+	<ef bf>4. <ef c'>8         ef4. c8  | d4.           c8 d     ef f  ef |
+	d4. ef16 d c4. c16 d |
+	%<ef c'>8 c' bf   c'  g4 <d g>8  ef  | f       g  f  ef c4       c8 bf,|
+
+	\tempo 4 = 107
+	                     ef4. g8 f ef d ef |
+	c4. d8 ef4. c8 | <d f>4. ef8 f \tuplet 3/2 {ef16 f ef} f8 g |
+	g4.       f16 g <d g>4 8    c16 d   | <c ef>4. g8 f ef f g |
+	<ef bf>4. <ef c'>8         ef4. c8  | d4.           c8 d     ef f  ef |
+	d4.       ef16 d c4.        c16 d   |
+	% identical to beginning
+	                                       bf8 c' g f g c ef f |
+	<bf, d> ef <g, d> bf, <g, c>4 g,8 bf,| <af, c> ef f  ef <bf, f>4 f8 ef |
+	f      bf <ef g>2           g8  bf  | <ef c'> c' bf c' g4   <d g>8 ef |
+	f      g  f      ef  c4     c8  bf, | <af, c>4 <af, c>8 ef <bf, f> ef <d f> g |
+
+	<ef, c>2             <g, c>4 f8 g   | <bf, d>8 ef \tuplet 3/2 {d16 ef d} bf,8 <g, c>4 g,8 bf, |
+	<af, c> ef f  ef <bf, f>4 f8 ef |
+	\tempo 4 = 107
+	                                  f f16 ef f8 bf <ef g>4 g8 bf |
+	\tempo 4 = 104
+	<ef c'> c' bf c' g4   <d g>8 ef |
+	\tempo 4 = 100
+	                                  f      g  f      ef  c4     c8  bf, |
+	\tempo 4 = 95
+	<af, c>4 8 ef <bf, f> ef bf4 | <ef c'>1 |
+
+	%\tuplet 3/2 {ef16 f fs} g fs f ef c bf c ef c4.~ | c1 |
+
+
+	%ef4.     g8 f ef d ef |
+	%c4.       d8   ef4.             c8  | <d f>4. ef8 f \tuplet 3/2 {ef16 f ef} f8 g |
+	%g4.       f16 g <d g>4 8    c16 d   | <c ef>4. g8 f ef f g |
+	%<ef bf>4. <ef c'>8         ef4. c8  | d4.           c8 d     ef f  ef |
+}
+
+\score {
+	\violin
+	\layout {
+		\context {
+			\Score
+			proportionalNotationDuration = #(ly:make-moment 1/4)
+			\override SpacingSpanner.uniform-stretching = ##t
+			\override SpacingSpanner.strict-grace-spacing = ##t
+		}
+	}
+}
+\score {
+	\unfoldRepeats {
+		\violin
+	}
+	\midi {  }
+}

game/necrofantasia.ly

@@ -39,7 +39,7 @@ violin = \new Staff \with {
    {
 		as='4   es' bs es  | cs4. ds4. gs4 | as4.-3
 		\override NoteHead.color = "blue"
-		                                            a2~-1 a8 | cs4. bs4. as4 |
+		                                            a2~-1 a8 | cs4. bs4. as4~ |
 		as=''4.
 		\override NoteHead.color = "black"
 		        gs4.-2 as4 | es4  gs ds bs | cs4. bs2~ bs8 |
@@ -57,15 +57,17 @@ violin = \new Staff \with {
 		d=''4  d8 d r d d r      | cs4 cs8 e4 e8 fs8 r8 |
 		d=''4   r8 cs4 r8 d4     | r1                   |
 		<b=' b'>4-1-4 8 8 r8 8 8 r8  | <cs cs'>4-1-4 8 8 r8 8 8 r8    |
-		cs'='''4-4 8 8 r8 cs8 8 r8 | fs,4-1 r8 as4 r8 fs4   |
+		<cs cs'='''>4 8 8 r8 8 8 r8 | fs4-1 r8 fs4 r8 fs4   |
 		%d'='''4  d8 d r d d r   | cs4 cs8 e4 e8 fs8 r8 |
 		%d='''4   r8 cs4 r8 d4   | r1                   |
 		%<b, b'>4 8 8 r8 8 8 r8  | <cs cs'>4 8 8 r8 8 8 r8 |
 		%cs'=''4 8 8 r8 cs8 8 r8 | fs,4 r8 bf4 r8 fs4      |
 	}
 
-	\key c \major
+	\key a \minor
 	r1 |
+	\repeat volta 2 {
+
 	e=''4-2 c'-3 b d,8 e~ | e=''2..          r8  |
 	e4      d'   c b8 c8~ | c='''4  b a g8-2 a8~ |
 	a4      g    e g8 a8~ | a=''4   g e g8   e~  |
@@ -75,6 +77,9 @@ violin = \new Staff \with {
 	a=''4   g    e g8  a~ | a=''4   g e g8 <cs, a'>~-2-3 |
 	1~                    | 2.. r8
 
+	\volta 2 \fine
+	\volta 1
+
 	c=''4 e  d  b8 c8~ | c2..      r8   |
 	c4    d  e  d8 e8~ | e4 d c b8 c8~  |
 	c4    b  a  b8 c8~ | c4 b a b8 a8~  |
@@ -95,13 +100,13 @@ violin = \new Staff \with {
 	%1~                    | 2..         r8   |
 
 	\key gs \minor
-	gs='2..        r8   | gs4 as b   cs8  gs8~ |
+	gs='2..-1        r8   | gs4  as b  cs8 gs8~ |
 	gs2..            r8   | ds'4 cs b  cs8 b8~  |
-	b4   as gs as8 b8~  | b4  as gs  as8  b8~  |
+	b4-3 as-3 gs as8 b8~  | b4   as gs as8 b8~  |
 	b4   cs   ds cs8 ds8~ | ds2..          r8   |
 	ds=''2..         r8   | gs,4 as b  as8 b8~  |
-	b4 as gs  fs8  gs8~ | gs2..           r8   |
+	b4 as gs  fs8    gs8~ | gs2..-2        r8   |
-	ds'4 cs b  cs8  b8~ | b4  as gs  as8  bs8~ |
+	ds'4-1 cs b  cs8 b8~  | b4   as gs as8 bs8~ |
 	1~                    | 2..            r8   |
 
 	% Fitted closer to ZUN version
@@ -119,6 +124,7 @@ violin = \new Staff \with {
 	%b4 as gs  fs8  gs8~ | gs2..           r8   |
 	%gs4 as b  cs8  gs8~ | gs4 as gs  as8  bs8~ |
 	%bs1~                | bs2..           r8   |
+	}
 }
 
 \score {